ButterflyEffect/uniswap-interface-uncensored
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,894 Commits 1 Branch 671 Tags 826 MiB
784fbfe7b1
Commit Graph

4161 Commits

Author SHA1 Message Date
Jack Short
1249371397
feat: currency conversion feature flag (#7123) 
* feat: currency conversion feature flag

* removing eslint
 2023-08-11 13:13:17 -04:00
Tina
e31f4e549b
feat: Fetch updated nonce before a UniswapX swap (#7120) 
* add method to fetch updated gouda nonce

* remove console log
 2023-08-11 10:33:07 -04:00
eddie
9fbdc3cab1
feat: base flag cleanup (#7134) 
feat: remove base feature flag
 2023-08-10 11:05:48 -07:00
eddie
e04be0711f
fix: unknown token logo styling (#7132) 
* fix: unknown token logo styling

* fix: tests
 2023-08-10 11:05:32 -07:00
eddie
5c3caa7143
feat: query base backend (#7133) 2023-08-10 11:05:23 -07:00
Jack Short
1ea724609f
feat: bottom sheet for mobile swap settings (#7072) 
* feat: bottom sheet for settings dialogue

* renaming to settings

* renmaing

* cypress tests

* fixing the cypress tests

* chore: e2e insufficient liquidity test

* Revert "chore: e2e insufficient liquidity test"

This reverts commit 8250730f35182246ec908b5878b91b55a51cb941.
 2023-08-10 12:20:31 -04:00
Jordan Frankfurt
2b6948db94
fix: standardize styled component file names and ignore them in codecov (#7113) 
* fix: standardize styled component file names and ignore them in codecov

* Update codecov.yml

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

---------

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
 2023-08-10 11:15:33 -05:00
Jordan Frankfurt
0b8026e6fe
feat: add base promotional advert (#7124) 
* feat: add base promotional advert

add mobile layout

tweak text container size

only show new banner on Base

fix import

update to new state structure

* Update src/components/Banner/BaseAnnouncementBanner/index.tsx

Co-authored-by: Charles Bachmeier <charles@bachmeier.io>

* pr feedback

---------

Co-authored-by: Charles Bachmeier <charles@bachmeier.io>
 2023-08-10 11:03:21 -05:00
Charles Bachmeier
b12a61e2fb
feat: add multichain_ux flag (#7122) 
* feat: add multichain_ux flag

* update flag text

* add new flag file
 2023-08-09 16:47:38 -07:00
Charles Bachmeier
06c81d9304
feat: add amplitude logging for gas estimate failures (#7095) 
* send gas estimate failure

* update event name

* update analytics events package

* add error and tx to analytics event
 2023-08-09 12:28:52 -07:00
Nate Wienert
f6b66c759a
fix: make loading indicator for pools nft card use a shine rather than spinner (#7071) 
fix: make loading indicator for pools nft card use a shine rather than spinner and fill the full height
 2023-08-09 08:14:08 -10:00
Jack Short
b1c99d4b37
chore: moving coned formatting to interface (#7114) 2023-08-09 14:01:37 -04:00
Zach Pomerantz
08501234a8
build: replace babel with swc (#7056) 
* chore: refactor ms.macro to ms

* build: upgrade lingui@4

* chore: avoid styled-components/macro

* build: replace babel loader with swc

* build: upgrade vanilla-extract

* build: simplify e2e config

* build: migrate jest to swc

* build: dedup

* whoops

* fix: initial translations

* build: coverage

* build: ignore static extract warning

* build: rm old babel pkg

* test: rm e2e codecov

* build: fix swc cache

* cleanup

* fix visible t9ns

* cleanup

* cleanup setup

* crank it

* actual merge conflict resolution

* fix: restore locale initialization
 2023-08-08 10:38:37 -07:00
Jordan Frankfurt
3afe7fe9f2
fix: add back correct fellback setter (#7102) 2023-08-08 12:37:57 -05:00
cartcrom
bd573724b9
fix: uniswapx review modal success display (#7097) 
* fix: update swapConfirmed logic

* fix: success icon display
 2023-08-08 10:15:32 -07:00
Zach Pomerantz
684258dc17
fix: keep a referentially stable connectors list (#7090) 2023-08-08 08:46:01 -07:00
Charles Bachmeier
a53e773e5d
refactor: shelve Details redesign for now (#7077) 
* shelve Details redesign for now

* remove feature flag enum

* no longer used utils
 2023-08-08 08:28:43 -07:00
cartcrom
5307d113a8
feat: eth output feature flag for uniswapx orders (#7078) 2023-08-08 11:23:46 -04:00
Mike Grabowski
c9b4016b78
feat: use router depending on the origin (#6982) 
* feat: initial commit

* chore: whitelist vercel

* chore: fix e2e test

* chore: update all occurences of #

* chore: tweaks

* chore: remove todo

* chore: revert changes

* chore: bring back old tweet logic and fix nested URLs

* chore: fix merge

* improve check

* fix: cypress

* chore: fix tests

* chore: update snapshot

* chore: update readme

* address review

* satisfy eslint

* chore: fix ui issue

* fix: tests

* fix: e2e test
 2023-08-07 15:01:45 -07:00
eddie
a7135c9ab1
fix: check chainId in findCancelTx (#7098) 
* fix: check chainId in findCancelTx

* fix: add comment explaining fix

---------

Co-authored-by: cartcrom <cartergcromer@gmail.com>
 2023-08-07 13:58:33 -07:00
Jordan Frankfurt
a1b3776686
feat: vertical LP (#7000) 
* Re-organize add liquidity page

* fix title alignment

* Update styles

* Update logic for disable/enable input on creation

* lint and clean up a couple small things

* lint and clean up a couple small things

* Tweak UI

* clean up code

* add back range selector

* remove inline styles

---------

Co-authored-by: Callil Capuozzo <callil@uniswap.org>
 2023-08-07 14:22:45 -05:00
eddie
fa4e75b777
feat: base network (#6997) 
* feat: initial support for base goerli

* wip: update dependencies

* chore: yarn deduplicate

* feat: mainnet wip support

* feat: mainnet wip support

* fix: radial gradient

* fix: logo update

* fix: ur address

* fix: add weth to common bases

* fix: updates

* fix: yarn dedup

* fix: correct rpc url

* fix: correct explorer url

* feat: add USDbC to common bases

* fix lint warnings

* bump SOR version

* fix: fallback URLs

* feat: statsig flag for base support (#7079)

* feat: put base support behind statsig flag

* fix: null checks

* fix: hide pool page

* fix: baseEnabledChains

* feat: update sor

---------

Co-authored-by: Jordan Frankfurt <jordan@uniswap.org>
 2023-08-04 11:43:11 -07:00
eddie
dbb2f7f6a2
fix: re-enable UniswapX after disabling (#7080) 
fix: allow gouda after user disables
 2023-08-03 16:45:04 -07:00
eddie
264f145708
fix: Router label copy (#7060) 2023-08-03 15:08:59 -07:00
eddie
bb2677ab1b
fix: match PendingModalContent number formatting w/ SwapModalHeader (#7053) 
* fix: match PendingModalContent number formatting w/ SwapModalHeader

* fix: typo

* fix: remove argument
 2023-08-03 12:50:46 -07:00
eddie
29e46455c1
fix: use submitted icon on mainnet (#7055) 
* fix: use submitted icon on mainnet

* fix: e2e test

* fix: some cleanup
 2023-08-03 12:15:25 -07:00
Jack Short
cfc9748036
fix: adjusting slippage in a different language (#7073) 
* fix: adjusting slippage in a different language

* making overflow hidden on close

* passing width instead of visibility

* min width
 2023-08-03 15:05:47 -04:00
eddie
715555f340
feat: time-to-swap metric (#7051) 
* test(cypress): disable infura from browser

* build: typecheck cypress

* build: es5

* build: rm cypress videos

* fix failing tests

* skip nft failure and rm infra-175

* feat: implement tts metric

* wip e2e test

* fix: improve v2 network support (#7012)

* fix: improve v2 network support

* add an unsupported message to all v2 pages

* test: add v2 pool tests

* add guard on transaction callbacks

* fix: dep array

---------

Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com>

* test: adjust test options

* fix: move to helper method

* fix: merge and make code style change

* fix: use local variable to track first event

* fix: amplitude cypress command

* fix: use file-level var

* fix: clear input in test

---------

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
 2023-08-03 11:33:16 -07:00
cartcrom
6a1f17ab5a
feat: update cancelled local tx's (#7008) 
* feat: update cancelled local tx's

* fix: use updated queries

* test: add cancel reducer and hook tests

* fix: spelling in test descriptor

* feat: improved activity descriptors

* fix: check activity groups instead of activity

* fix: pending hooks cleanup

* fix: destruct object from pending hook

* refactor: update usage of pending util

* fix: removed unused util
 2023-08-03 12:35:51 -04:00
gnewfield
24d00f7c39
fix: init pool behavior (#7052) 
* Disable increment/decrement  when range prices undefined

* Enable full-range price selection for new pools

* Add cypress tests

* Fix lint error
 2023-08-03 10:52:18 -04:00
Brendan Wong
b8573930b9
fix: update v2 pool information link (#7058) 
update link
 2023-08-02 19:07:08 -04:00
Brendan Wong
2c1e608f84
fix: closes settings state when MP is closed (#7065) 
* fix: close settings menu on drawer close

* migrate change to default menu

* remove indent

* add cleanup
 2023-08-02 19:06:57 -04:00
Brendan Wong
f90066263e
fix: bring back safeNamehash (#7050) 
* fix: bring back safeNamehash

* Update safeNamehash.test.ts
 2023-08-02 15:15:10 -07:00
Brendan Wong
708a813f2a
feat: MP closes on scroll down (#6682) 
* feat: MP closes on scroll down

* fix: make dismissal smoother

* fix: implement react gestures and fix scroll

* fix: fix drag when not starting from top

* fix: double scroll on mobile

* fix: comments for clarity

* fix: mobile scrolling?

* remove console logs

* potential fix?

* remove change again

* maybe fix?

* cope

* even more cope

* even more more cope

* copiest

* make less buggy

* nope

* maybe?

* HOLD

* maybe

* try 2

* maybe

* hopefully

* test

* another try

* cope

* redo

* attempt 2

* hmm

* maybe

* I THINK
 2023-08-02 17:15:23 -04:00
gnewfield
18b50283d3
fix: clip long token names (#7066) 
* Clip token name with ellipsis style

* Use built-in ellipsis style
 2023-08-02 17:02:40 -04:00
Brendan Wong
d9ff7b15a1
fix: swap flashing the wrong value after the input is cleared. (#6719) 
* fix: set input panel to 0 when recalculating

* fix: only reset number when input cleared

* fix: remove useEffect and more graciously handle trade mutation
 2023-08-02 16:04:50 -04:00
Ankit Boghra
cc5309b18f
fix: broken link for polygon mumbai bridge (#6986) 
fix: broken link for polygon bridge

Co-authored-by: Charlie B <charles@bachmeier.io>
 2023-08-02 12:20:21 -07:00
eddie
a060bf1079
fix: remove unused variable (#7061) 2023-08-02 12:06:04 -07:00
Jordan Frankfurt
1ffb9421b2
fix: style and copy updates to the swap box (#7006) 
* add you pay/you receive label to swap inputs

* update styles

* update snapshots
 2023-08-02 13:39:05 -05:00
Zach Pomerantz
7978ed97a9
test(cypress): clean up types/assumptions/infura (#7046) 2023-08-01 22:13:19 -07:00
Jordan Frankfurt
fc0bf229a7
fix: improve v2 network support (#7012) 
* fix: improve v2 network support

* add an unsupported message to all v2 pages

* test: add v2 pool tests

* add guard on transaction callbacks

* fix: dep array

---------

Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com>
 2023-07-31 10:04:22 -05:00
Zach Pomerantz
b55680dbce
test: deflake and clean universal search (#7034) 2023-07-28 16:36:13 -07:00
Brendan Wong
136e68201f
fix: top token charts on mobile (#6967) 
* fix: top token charts on mobile

* Update TokenRow.test.tsx.snap

* Update src/components/Tokens/TokenTable/TokenRow.tsx

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

* Update src/components/Tokens/TokenTable/__snapshots__/TokenRow.test.tsx.snap

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

* update

* Update TokenRow.test.tsx.snap

* Update TokenRow.test.tsx.snap

---------

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
 2023-07-28 17:50:02 -04:00
Brendan Wong
b4bb3d72d5
fix: text wrap and spacing on mobile TDP (#6909) 
fix text wrap and spacing on mobile TDP
 2023-07-28 17:24:35 -04:00
Brendan Wong
3f812f4aee
fix: clearing input on connect wallet (#6928) 
* fix: clearing input on connect wallet

* update e2e tests
 2023-07-28 16:45:58 -04:00
eddie
02883aca13
fix: reverted swap state (#7044) 
* fix: wait for transaction status in ConfirmSwapModal

* fix: use actual swap status in ConfirmSwapModal

* feat: add test

* fix: shared hook

* fix: fix test

* fix: dont create Activity instance
 2023-07-28 12:48:12 -07:00
gnewfield
0aafcdf885
fix: change style of mobile pool buttons and menu (#7020) 
* fix: menu flyout alignment overridden on mobile

* fix: change button order, sizing

* Replace deprecated media queries and text components
 2023-07-28 13:22:48 -04:00
cartcrom
f55062f9a9
test: mock quotes to avoid errors logged (#7031) 2023-07-28 11:39:49 -04:00
cartcrom
1fde2504b4
fix: use deeplink instead of universal link (#7017) 
* fix: use deeplink instead of universal link

* docs: added comment
 2023-07-28 10:58:01 -04:00
Zach Pomerantz
6a3abbfb56
fix: update mainnet block (#7042) 
* fix: update mainnet block

* fix: typecheck
 2023-07-27 15:40:10 -07:00
gnewfield
9ced714718
fix: improve currency select styling (#7009) 
* fix: remove currency select drop shadows and make deposit label non-interactive

* rename labelOnly prop to pointerEvents
 2023-07-27 14:27:59 -04:00
Brendan Wong
8ed6481f16
fix: display ens name/avatar on other chains (#6981) 
* maintain ens info on other chains

* update ens hook

* feedback!

* initial test

* test progress

* e2e test?

* final feedback

* fix(lint): rm unused test var

* fix final bugs

* last lint issue

* fix: update catches

* fix: define catch handlers

* fix: use error in catch

* empty commit

---------

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
 2023-07-27 13:34:26 -04:00
cartcrom
d160d1a929
feat: don't fetch UniswapX quotes if user has disabled UniswapX (#7028) 2023-07-27 13:33:20 -04:00
Brendan Wong
1092bc2c58
fix: collision of network banner and swap settings (#6910) 
* change z-index of network banner

* change to use pointer-events rather than deprecated value
 2023-07-27 13:22:03 -04:00
Tina
7ec6a965d3
feat: bump uniswapx-sdk (#7023) 
* bump uniswapx-sdk

* add feature flag

* use undefined if feature flag is off

* move to top level config

* remove unused variable
 2023-07-27 12:16:17 -04:00
Zach Pomerantz
a2d98607ea
fix: use redirect for landing (#6993) 
* fix: use redirect for landing

* chore: rm console.log
 2023-07-26 13:24:33 -07:00
eddie
27d9152949
fix: add amplitude event for uniswapX orders failing to post (#6977) 2023-07-26 12:10:22 -07:00
Jordan Frankfurt
4b39dfbd69
fix: update safety check cache time (#7005) 2023-07-26 10:14:54 -05:00
eddie
6c5c1c0032
fix: remove duplicate hook for permit2 approvals (#6999) 
* fix: remove duplicate hook for permit2 approvals

* fix: address comments
 2023-07-25 14:08:25 -07:00
Nate Wienert
9f71e384b2
fix: use deferred value to avoid suspense issues with inputting text (#6996) 
fix: use deferred value to avoid suspense issues with inputting text during supsended render causing errors
 2023-07-25 06:57:32 -10:00
Zach Pomerantz
4537a4dc94
fix: display already-loaded imgs with no transition (#6990) 2023-07-24 16:21:05 -07:00
Jack Short
db0cb41b61
fix: fixing price range filter passing as number (#6994) 2023-07-24 17:51:04 -04:00
eddie
4ced70f737
fix: use 100vh to position bottom sheet (#6989) 2023-07-24 10:02:48 -07:00
Jack Short
9262fec093
feat: add opt out analytics (#6983) 
* making shared settings toggle component

* adding description to analytics toggle

* trace analytics wrapper

* changing sendAnalytics to optOut

* updating functions

* moving atom location

* adding back testid to testnet toggle

* sending data on page load

* defaulting to true

* refactoring toggles

* renaming and moving to new filepath

* exporting everything out of analytics

* updating eslint

* typo

* responding to requested changes

* fixing merge conflicts
 2023-07-21 13:15:51 -04:00
Jack Short
ff3bcc4693
fix: purchase tweet url (#6987) 2023-07-21 10:24:55 -04:00
Charles Bachmeier
34a22ef9f0
fix: chain query parameter doesn't block you from switching chains (#6926) 
* useSearchParams

* delete old param

* properly handle a connected wallet

* update chain query via network switcher

* updated tests

* working test

* comment typo

* don't overwrite current params

* change chain based on user wallet interaction

* one instance of set

* update chainIdRef on account load

* useeffect

* set chainIdRef when isActive

* remove logging

* update comment

* make condition else if
 2023-07-20 17:05:12 -07:00
eddie
5e86cf7b29
fix: token img loading state (#6984) 
* fix: token img loading state

* fix: nits

* fix: update snapshots

* fix: token logos in MP and tests

* fix: really weird visibility / tooltip bug

* fix: update snapshots
 2023-07-20 13:51:29 -07:00
Nate Wienert
83172dc5ea
feat: add tracking params and go straight to app store for iOS for the landing page wallet CTA (#6732) 
* feat: add tracking params and go straight to app store for iOS for the landing page wallet CTA
 2023-07-20 10:28:08 -10:00
Nate Wienert
0ca68bb140
feat: disconnect button hides after hover out, click away, and improv… (#6968) 
* feat: disconnect button hides after hover out, click away, and improved animations and colors
 2023-07-20 09:00:56 -10:00
eddie
430356da9a
fix: update text in ConfirmSwapModal (#6971) 2023-07-20 10:12:31 -07:00
Nate Wienert
1c50460160
fix: using search hotkey enter navigates to the wrong result (#6735) 
* fix: fix SearchBarDropdown selecting invalid result on enter after initial search when recent searches are filled

* add test

* Update cypress/e2e/universal-search.test.ts

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

* Update cypress/e2e/universal-search.test.ts

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

* Update cypress/e2e/universal-search.test.ts

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

* use searhc hotkey

* Revert ""

This reverts commit 7b04d5d575e8f776e8127e9b43c3fff6f74d8919.

* chore: gitignore cypress/downloads.html

---------

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
 2023-07-19 11:58:02 -10:00
Zach Pomerantz
2ef9e9b61c
fix: show logos on warned tokens (#6978) 
* fix: show logos on warned tokens

* test: update snapshots

* fix: hide logos for unsupported tokens
 2023-07-19 14:00:50 -07:00
Charles Bachmeier
b906cddc6a
fix: update depedencies to fix avax/bnb routing (#6974) 
* fix: update depedencies to fix avax/bnb routing

* pull latest

* use rpc_url

* deduplicate
 2023-07-19 09:58:08 -07:00
Charles Bachmeier
8956fba629
fix: Silence linter warnings for GA (#6962) 
ga analytics
 2023-07-18 09:59:19 -07:00
Zach Pomerantz
0ced5f2402
fix: duck type error checking (#6924) 
* fix: duck type error checking

* fix: use duck-typing

* simplify

* fix typings

* fix comments
 2023-07-18 09:21:00 -07:00
eddie
01e87657c6
fix: format currency amounts as strings in logging (#6966) 
* fix: format currency amounts as strings in logging

* fix: toExact
 2023-07-17 17:27:17 -07:00
Brendan Wong
55bf30c0e0
fix: remove shadow and gap on mobile (#6906) 
* remove shadow and gap on mobile

* remove empty brackets
 2023-07-17 16:39:48 -04:00
Nate Wienert
95f61487e8
fix: uniswapx opt in double bounce animation (#6964) 2023-07-17 09:05:07 -10:00
eddie
3ed3ed4994
feat: sort tokens in selector by USD value (#6744) 
* feat: sort tokens in selector by USD value

* fix: sync visible balances in list with the sorting values

* fix: tryParseCurrencyAmount

* fix: remove todo

* fix: make shared hook for cached query

* fix: replace true with modalOpen

* fix: default to zero balance

* fix: add test and comment

* feat: fallback to unfilterd tokens

* fix: unconnected balances

* fix: update tests

* fix: test selector
 2023-07-17 11:28:28 -07:00
Charles Bachmeier
803eb46e5f
fix: Clear input and output when wrapping and unwrapping (#6913) 
* add wrap handler

* onWrap passed back tx hash

* async await
 2023-07-17 10:13:15 -07:00
Charles Bachmeier
52796fcc55
feat: Sort chains based on user relevance (#6915) 
* sort chains based on user relevance

* test.each

* remove unnecessary comment and add chainId to test name
 2023-07-17 10:10:12 -07:00
eddie
ca02a6b56a
fix: log opt in impression (#6959) 
* fix: log opt in impression

* fix: move trace up to parent level
 2023-07-17 10:06:42 -07:00
Jack Short
b722a20d96
fix: swap divide by zero (#6922) 
* fix: swap divide by zero

* putting evaluation in memo
 2023-07-17 12:38:49 -04:00
Jack Short
9b5261aaeb
fix: v2 liquidity divide by zero (#6921) 2023-07-17 12:06:52 -04:00
Brendan Wong
0efb7f51a4
fix: remove new badge from Uniswap Wallet (#6911) 
* remove new badge from Uniswap Wallet

* remove isNew field and badge

* clean lint
 2023-07-17 11:55:28 -04:00
Zach Pomerantz
bbe42b81de
fix: display token images on first pageload (#6956) 
* fix: always show img for common bases

* fix: include backup img in first render

* fix: initialize and update token safety lookup

* test: update snapshots to include initial logos

* refactor: better code colocation

* test: updating token safety lookup table

* refactor: tokenSafetyLookup

* refactor: tokenLogoLookup

* fix: pass lists state to token safety update

* test: mock initial update
 2023-07-15 18:33:13 -07:00
cartcrom
e9f469d399
fix: hide pending orders from GQL (#6955) 
* fix: hide pending orders from GQL

* fix: update comment and add TODO
 2023-07-15 18:03:21 +01:00
Tina
4c58258f01
feat: additional routing option prototype (#6934) 
* add npm secret and modify github actions

* inject npm secret for tests as well

* revert changes to staging and prod actions because we arent going to use themmm

* remove unused github actions

* minor copy change for convenience lol

* feat: add DutchOrderTrade type to Swap components (#8)

* feat: add flag for gouda (#5)

* feat: add new signature details type (#4)

* feat: local gouda activity (#9)

* feat: Unified Routing API classic and dutch limit quote requests (#10)

* chore: Rebase 5/26 (#13)

Co-authored-by: Mike Grabowski <grabbou@gmail.com>
Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
Co-authored-by: Vignesh Mohankumar <me@vig.xyz>
Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com>
Co-authored-by: Jack Short <john.short.tj@gmail.com>
Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com>
Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Nate Wienert <natewienert@gmail.com>
Co-authored-by: Charles Bachmeier <charles@bachmeier.io>
Co-authored-by: Charles Bachmeier <charlie@genie.xyz>

* feat: add UniswapX to Settings (#7)

* feat: merge upstream 5/31 (#16)

* feat: Upgrade unified-routing-api URL (#15)

* chore: merge upstream 6/2 (#19)

Co-authored-by: Mike Grabowski <grabbou@gmail.com>
Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com>
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
Co-authored-by: Vignesh Mohankumar <me@vig.xyz>
Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com>
Co-authored-by: Jack Short <john.short.tj@gmail.com>
Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Nate Wienert <natewienert@gmail.com>
Co-authored-by: Charles Bachmeier <charles@bachmeier.io>
Co-authored-by: Charles Bachmeier <charlie@genie.xyz>

* feat: uniswapx gas tooltip (#12)

Co-authored-by: Mike Grabowski <grabbou@gmail.com>
Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com>
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
Co-authored-by: Vignesh Mohankumar <me@vig.xyz>
Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com>
Co-authored-by: Jack Short <john.short.tj@gmail.com>
Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Nate Wienert <natewienert@gmail.com>
Co-authored-by: Charles Bachmeier <charles@bachmeier.io>
Co-authored-by: Charles Bachmeier <charlie@genie.xyz>

* feat: swap callback (#17)

* feat: gouda gating (#14)

Co-authored-by: Mike Grabowski <grabbou@gmail.com>
Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com>
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
Co-authored-by: Vignesh Mohankumar <me@vig.xyz>
Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com>
Co-authored-by: Jack Short <john.short.tj@gmail.com>
Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Nate Wienert <natewienert@gmail.com>
Co-authored-by: Charles Bachmeier <charles@bachmeier.io>
Co-authored-by: Charles Bachmeier <charlie@genie.xyz>

* fix: settings e2e test (#22)

* feat: update swap callback to add orders to redux state (#18)

* chore: Fix types for useBestTrade return result (#21)

* feat: gql gouda orders (#20)

* feat: show $0 for gas fee for now (#25)

* chore: Rebase 06/08 (#26)

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com>
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
Co-authored-by: Vignesh Mohankumar <me@vig.xyz>
Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com>
Co-authored-by: Jack Short <john.short.tj@gmail.com>
Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com>
Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Nate Wienert <natewienert@gmail.com>
Co-authored-by: Charles Bachmeier <charles@bachmeier.io>
Co-authored-by: Charles Bachmeier <charlie@genie.xyz>
Co-authored-by: Brendan Wong <35351983+LunrEclipse@users.noreply.github.com>
Co-authored-by: cartcrom <cartergcromer@gmail.com>
Co-authored-by: clrdo <129212060+clrdo@users.noreply.github.com>
Co-authored-by: clrdo <clrdo@github.com>
Co-authored-by: Eddie Dugan <eddie.dugan@uniswap.org>

* feat: poll on order submit (#23)

* feat: update gouda-sdk to 1.0.0-alpha.3 (#31)

* feat: rename gasUseEstimateUSD for dutch orders (#30)

Co-authored-by: Tina Zheng <tina.s.zheng+github@gmail.com>

* chore: Fix response types (#36)

* feat: Gouda ETH input flow (#29)

Co-authored-by: Eddie Dugan <eddie.dugan@uniswap.org>

* fix: use trade to determine what router label to show (#41)

* feat: open uniswapx modal on click (#32)

* feat: gouda logging new params in swap quote received (#33)

* fix: wrap step ui fixes (#40)

* feat: use BE deadline padding (#46)

* chore: merge 6/23 (#50)

Co-authored-by: Mike Grabowski <grabbou@gmail.com>
Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
Co-authored-by: Vignesh Mohankumar <me@vig.xyz>
Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com>
Co-authored-by: Jack Short <john.short.tj@gmail.com>
Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com>
Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Nate Wienert <natewienert@gmail.com>
Co-authored-by: Charles Bachmeier <charles@bachmeier.io>
Co-authored-by: Charles Bachmeier <charlie@genie.xyz>
Co-authored-by: Brendan Wong <35351983+LunrEclipse@users.noreply.github.com>
Co-authored-by: cartcrom <cartergcromer@gmail.com>
Co-authored-by: clrdo <129212060+clrdo@users.noreply.github.com>
Co-authored-by: clrdo <clrdo@github.com>
Co-authored-by: Shubham Rasal <95695273+Shubham-Rasal@users.noreply.github.com>
Co-authored-by: Saro Vindigni <sarovindigni@bolket.com>
Co-authored-by: Jordan Frankfurt <<jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: John Short <john.short@CORN-Jack-899.local>

* feat: Gouda opt-in flow request logic (#37)

Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com>

* feat: hide slippage and deadline settings when the current trade is gouda (#44)

* feat: use settled order amounts (#45)

* feat: fetch receipt before dispatch (#49)

* fix: updated order popups to launch modal (#48)

* feat: Use slippage value from URA response for UniswapX trades (#51)

* fix: Bump gouda-sdk to match backend response for quotes (#58)

* feat: Change gouda order status URL param from offerer -> swapper (#59)

* feat: disable opt in flow (#57)

* feat: Dont show USD value change for uniswapx trades (#55)

* fix: Don't use WETH as input currency for Classic ETH-in trades (#54)

* feat: Reset to WETH after wrap is complete (#52)

* fix: correct descriptor in UniswapX activity row items (#61)

* fix: align review modal and gouda activity modal (#60)

Co-authored-by: Charles Bachmeier <charles@bachmeier.io>

* feat: Get wrap and approve gas info (#53)

Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com>

* fix: restore summary view when wrap is rejected (#66)

* fix: serialize tx receipts before storing (#64)

* fix: Insufficient balance check should read from the right currency (#65)

* feat: update designs for gas tooltips (#67)

* fix: UniswapX gas descriptor boolean (#69)

* chore: Bump conedison for better gas price formatting (#70)

* chore: Switch from gouda-sdk to uniswapx-sdk (#71)

* chore: Rename all variables `gouda` to UniswapX (#72)

* chore: Merge 7/8/23 (#73)

Co-authored-by: Mike Grabowski <grabbou@gmail.com>
Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
Co-authored-by: Vignesh Mohankumar <me@vig.xyz>
Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com>
Co-authored-by: Jack Short <john.short.tj@gmail.com>
Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com>
Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Nate Wienert <natewienert@gmail.com>
Co-authored-by: Charles Bachmeier <charles@bachmeier.io>
Co-authored-by: Charles Bachmeier <charlie@genie.xyz>
Co-authored-by: Brendan Wong <35351983+LunrEclipse@users.noreply.github.com>
Co-authored-by: cartcrom <cartergcromer@gmail.com>
Co-authored-by: clrdo <129212060+clrdo@users.noreply.github.com>
Co-authored-by: clrdo <clrdo@github.com>
Co-authored-by: Shubham Rasal <95695273+Shubham-Rasal@users.noreply.github.com>
Co-authored-by: Saro Vindigni <sarovindigni@bolket.com>
Co-authored-by: Jordan Frankfurt <<jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: John Short <john.short@CORN-Jack-899.local>
Co-authored-by: Charlie Bachmeier <charlie.bachmeier@Charlies-MacBook-Pro.local>
Co-authored-by: UL Service Account <hello-happy-puppy@users.noreply.github.com>

* chore(conedison): update package (#77)

* feat: add opt-in UI (#68)

* chore: address some todos (#79)

* chore: Rename feature flag from gouda_enabled to uniswapx_enabled (#81)

* feat: Copy changes (#82)

* fix: improve timings on animations for gouda opt-in (#80)

* chore: Use updated URLs (#84)

* chore: Merge 7/14 (#85)

Co-authored-by: Mike Grabowski <grabbou@gmail.com>
Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
Co-authored-by: Vignesh Mohankumar <me@vig.xyz>
Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com>
Co-authored-by: Jack Short <john.short.tj@gmail.com>
Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com>
Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Nate Wienert <natewienert@gmail.com>
Co-authored-by: Charles Bachmeier <charles@bachmeier.io>
Co-authored-by: Charles Bachmeier <charlie@genie.xyz>
Co-authored-by: Brendan Wong <35351983+LunrEclipse@users.noreply.github.com>
Co-authored-by: cartcrom <cartergcromer@gmail.com>
Co-authored-by: clrdo <129212060+clrdo@users.noreply.github.com>
Co-authored-by: clrdo <clrdo@github.com>
Co-authored-by: Shubham Rasal <95695273+Shubham-Rasal@users.noreply.github.com>
Co-authored-by: Saro Vindigni <sarovindigni@bolket.com>
Co-authored-by: Jordan Frankfurt <<jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: John Short <john.short@CORN-Jack-899.local>
Co-authored-by: Charlie Bachmeier <charlie.bachmeier@Charlies-MacBook-Pro.local>
Co-authored-by: UL Service Account <hello-happy-puppy@users.noreply.github.com>

* remove changes to github actions files

* fix import

* actually revert changes to yml

* remove method export

* feat: Add feature flag for synthetic quotes (#6938)

* fix: use Lingui Trans macro (#6943)

* fix: use trans macro

* add comments

* fix: update updater.tsx (#6942)

* fix: reformat variable to use ms

* move interval definition above getOrderStatus

* lint :)

* revert

* chore: bunch of nits (#6944)

bunch of nits

* fix: translations etc (#6945)

* chore: Remove placeholder signature types (#6937)

remove placeholder

* chore: merge main into branch (#6948)

* fix: Handle Scientific Notation for NFT Collection Activity Prices (#6936)

wrap nft activity price in

* fix: e2e tests (#6941)

* fix: e2e test

* fix: set flag for buy-crypto-modal test

* fix: fund DAI

---------

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

---------

Co-authored-by: Charles Bachmeier <charles@bachmeier.io>

* feat: make inputCurrency optional for swapheader (#6947)

* make inputCurrency optional for swapheader

* optional pass in

* fix: function defined twice (#6950)

fix lint

* test: add signatureToActivity undefined tests (#6949)

* fix: update token lists schema (#6951)

fix: update token list schema

* chore: some last nits (#6953)

* refactor: base type

* test: useUserDisabledUniswapX

* chore: simplify useAllSignatures usage

* chore: standard check order

* lint

---------

Co-authored-by: eddie <66155195+just-toby@users.noreply.github.com>
Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com>
Co-authored-by: Mike Grabowski <grabbou@gmail.com>
Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
Co-authored-by: Vignesh Mohankumar <me@vig.xyz>
Co-authored-by: Jack Short <john.short.tj@gmail.com>
Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: Jordan Frankfurt <jordan@corn-jordan-949.lan>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Nate Wienert <natewienert@gmail.com>
Co-authored-by: Charles Bachmeier <charles@bachmeier.io>
Co-authored-by: Charles Bachmeier <charlie@genie.xyz>
Co-authored-by: Brendan Wong <35351983+LunrEclipse@users.noreply.github.com>
Co-authored-by: cartcrom <cartergcromer@gmail.com>
Co-authored-by: clrdo <129212060+clrdo@users.noreply.github.com>
Co-authored-by: clrdo <clrdo@github.com>
Co-authored-by: Eddie Dugan <eddie.dugan@uniswap.org>
Co-authored-by: marktoda <toda.mark@gmail.com>
Co-authored-by: Shubham Rasal <95695273+Shubham-Rasal@users.noreply.github.com>
Co-authored-by: Saro Vindigni <sarovindigni@bolket.com>
Co-authored-by: Jordan Frankfurt <<jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: John Short <john.short@CORN-Jack-899.local>
Co-authored-by: Charlie Bachmeier <charlie.bachmeier@Charlies-MacBook-Pro.local>
Co-authored-by: UL Service Account <hello-happy-puppy@users.noreply.github.com>
 2023-07-14 14:46:59 -07:00
Jack Short
f6e6db6430
fix: pwat stack overflow (#6952) 2023-07-14 17:35:08 -04:00
Charles Bachmeier
dab445f237
fix: e2e tests (#6941) 
* fix: e2e test

* fix: set flag for buy-crypto-modal test

* fix: fund DAI

---------

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
 2023-07-14 11:54:25 -07:00
Charles Bachmeier
da90738ba1
fix: Handle Scientific Notation for NFT Collection Activity Prices (#6936) 
wrap nft activity price in
 2023-07-14 09:54:48 -07:00
Vignesh Mohankumar
e4dbef80eb
chore: remove Google Analytics from CSP (#6888) 
* disable ga

* comment
 2023-07-07 14:15:41 -04:00
Vignesh Mohankumar
e169c9d900
chore: delete WalletConnect v1 (#6857) 
* chore: remove walletConnectFallback flag

* chore: remove walletConnectV2 flag

* chore: delete WalletConnect v1

* chore: remove walletConnectV2 flag (#6856)

* rm hidden

* toggle account drawer

* fix test

* Revert "rm hidden"

This reverts commit 9e8dd65b04b1072d3565cb70defb46d1524791f3.

* fix test

* -u

* optional?

* Revert "optional?"

This reverts commit 8456080b78cfae58737918daeb929bdaf0758cba.

* switch mock

* expect

* test

* fix test

* update connection tests
 2023-07-07 14:06:07 -04:00
Vignesh Mohankumar
552a38994b
chore: remove WalletConnect feature flags (#6855) 
* chore: remove walletConnectFallback flag

* chore: remove walletConnectV2 flag (#6856)

* rm hidden

* toggle account drawer

* fix test

* Revert "rm hidden"

This reverts commit 9e8dd65b04b1072d3565cb70defb46d1524791f3.

* fix test

* -u

* optional?

* Revert "optional?"

This reverts commit 8456080b78cfae58737918daeb929bdaf0758cba.

* switch mock

* expect

* test
 2023-07-07 13:15:13 -04:00
Jack Short
88aec2c894
fix: 0 showing as collected fee amount (#6804) 
* fix: 0 showing as collected fee amount

* initial test setup

* fire events

* checking for data in tests
 2023-07-07 12:51:35 -04:00
Vignesh Mohankumar
bcb45cded6
feat: add user id to sentry (#6896) 
* feat: add user id to sentry

* downgrade

* key

* Update src/tracing/index.ts

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

* Update src/tracing/index.ts

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

* fixes

---------

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
 2023-07-07 11:14:36 -04:00
cartcrom
dfe50b4bee
feat: remove old routing slice and flag (#6895) 
feat: remove ura flag
 2023-07-07 09:49:42 -04:00
Charles Bachmeier
90f72e05b9
feat: upgrade sdk-core to 3.2.6 and add AVAX (#6757) 
* init refactor

* upgrade to 3.2.6 and refactor more uses of chainid

* cleaned up lock file

* remove console log and add placeholder

* use supported chains type for switch fn

* allow passing of all chainIds to switcher

* additional typecast

* better casting solution

* yarn.lock cleanup

* prettier

* better casting for rpc

* prettier

* deprecate no longer needed addresses

* better isSupported checking

* deprecate redundant fn

* cleanup toSupportedChainId

* address initial ocmments

* pretier

* includes testnet

* remove unused export

* merge conflicts

* spread for mutable copy

* explorer text

* check is supported before activating chain

* remove extra uses of mumbai

* remove cast to MockChainId

* retain var name supportedChainId

* updated prettier

* use t for explorer translation

* use mockchainid for test

* feat: Add Avalanche support (#6776)

* init avax

* add most avax props

* add logo

* correct subgraph

* update avax blocksPerFetch

* add square logo

* upgrade ur sdk

* version syntax

* correct tokens

* remove unused token

* remove unused token

* update token list and add coming soon to searchbar

* add coming soon to token explore page

* names to ids

* cleaned up routing

* usdc token

* upgrade default token list

* update SOR

* upgrade SOR

* merge conflicts

* snowtrace

* upgrade SOR

* handle be avax support

* temp hide avax

* show pool positions

* whole

* spotprice update

* not yet supported

* BACKEND_SUPPORTED_CHAINS

* add avax to BE not supported

* update multicall blocks to 5

* add todo

* updated prettier

---------

Co-authored-by: Charles Bachmeier <charlie@genie.xyz>

* be added avax token balances

* validateUrlChainParam should return eth for backend unsupported chain

* readonly

* respond to comments

---------

Co-authored-by: Charles Bachmeier <charlie@genie.xyz>
 2023-07-06 21:44:06 -07:00
Vignesh Mohankumar
3a0f6920d0
build: use webpack-retry-chunk-load-plugin (#6885) 
* build: use webpack retry chunk load plugin

* fix

* dedupe

* lint

* retry backoff

* reduce from 1000 to 500ms

* add cache bust query

* rm cache bust

* 3

* cache bust

* Update craco.config.cjs

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

---------

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
 2023-07-06 17:54:49 -04:00
Brendan Wong
a9e8e8b275
fix: web app without NFTs (#6712) 
* fix: web app without NFTs

* fix: change card display to memoization

* fix: remove unneeded imports and variables

* fix: readd search bar modification

* fix: update dependencies

* fix: update atom value to use hook

* fix: change hook name

* fix: add tests

* Update src/pages/Landing/index.tsx

Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>

* Update src/components/NavBar/SearchBar.tsx

Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>

* Update src/components/NavBar/SearchBarDropdown.tsx

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

* Update src/components/NavBar/SearchBarDropdown.test.tsx

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

* Update SearchBar.tsx

* fix lint

---------

Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
 2023-07-06 15:46:41 -04:00
Vignesh Mohankumar
4708d3d3d7
fix: update InterfaceGqlChain syntax (#6892) 
lint: update InterfaceGqlChain syntax
 2023-07-06 12:31:15 -04:00
Vignesh Mohankumar
27acddc0e7
chore: upgrade prettier (#6887) 
* lint

* upgrade prettier

---------

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
 2023-07-06 11:54:04 -04:00
Charles Bachmeier
102a935ff8
fix: Handle new and unsupported chains passed in from GQL BE (#6878) 
* add subset chain type and checks

* add sentry logging for invalid chain errors

* add test cases

* dynamic token balances

* add test for BE adding a new chain

* rename and use slice

* address comments

* undo yarn.lock changes

* make copy in utils

* chore: Declare GQL variables as readonly (#6889)

* declare gql variables as readonly

* remove console log

* Merge branch 'cab/error_supported_chain' into tina/gql-readonly

---------

Co-authored-by: Charlie B <charles@bachmeier.io>

---------

Co-authored-by: Charlie Bachmeier <charlie.bachmeier@Charlies-MacBook-Pro.local>
Co-authored-by: Tina <59578595+tinaszheng@users.noreply.github.com>
 2023-07-05 21:31:30 -07:00
Charles Bachmeier
614c15243e
fix: tokens with same name brake cypress test (#6890) 
* fix: tokens with same name brake cypress test

* lowercase
 2023-07-05 20:23:03 -07:00
Jack Short
0f75c6a52b
chore: matching swap input number formatting to mobile (#6788) 
* initial currency formatting

* updating price formatting on swap

* updating the test
 2023-07-05 17:37:57 -04:00
Brendan Wong
1c2ed1d9e4
fix: add margins for empty pool icon (#6884) 
* fix: increase height of svg

* update test
 2023-07-05 16:36:18 -04:00
Charles Bachmeier
82211a888c
fix: show bnb pool positions in mini port (#6880) 2023-07-05 11:16:11 -07:00
cartcrom
5dd8cbbdc9
chore: update tos & privacy policy last updated date (#6882) 2023-07-05 14:12:20 -04:00
eddie
5640c115de
fix: remove error popup when switching chains from URL param (#6866) 2023-07-03 17:13:12 -07:00
cartcrom
7b8114b401
fix: remove phantom from injection detection (#6875) 
* fix: remove phantom from injection detection

* fix: remove logo image
 2023-07-03 16:24:08 -04:00
Brendan Wong
8e36361866
fix: remove blue dot next to buy (#6808) 
* remove button

* remove dependencies

* fix: remove useBuyFiatFlowCompleted

* fix: update lint and unit tests

* fix: update user state

* fix: remove migration

* Revert "fix: remove migration"

This reverts commit eef313f9ce2ea6b494ce2c9bc4a2fa6dbd1991ee.

* test

* fix: add ts ignore
 2023-07-03 15:55:49 -04:00
Jack Short
d3dd1d4ebd
fix: position list row highlight overflowing container (#6805) 2023-06-30 17:25:24 -04:00
Vignesh Mohankumar
326ae58f04
chore: update @walletconnect/modal (#6851) 
* chore: upgrade @walletconnect/modal

* fix
 2023-06-30 14:05:10 -04:00
Zach Pomerantz
e5591e8f06
fix: allow wallets w/o mainnet to connect to WCv2 (#6854) 
* fix: re-initialize wc connector with active chain

* test(e2e): fix universal-search flake
 2023-06-30 13:28:48 -04:00
Jordan Frankfurt
1c4a383a49
feat: gate v1 retirement (#6845) 
* Revert "feat(wallet-connect): retire v1 (#6820)"

This reverts commit d6759b86e3702a6da3df211752c06e4ee119d801.

* gate v1/v2 switch with v2 fallback on wc entry

* fix tests

* add a second flag--isolate ... menu and default values from each other

* Update src/components/WalletModal/Option.tsx

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

* Update src/featureFlags/flags/walletConnectPopover.ts

Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>

* pr feedback

* pr feedback

* pr nit

---------

Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt>
Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
 2023-06-26 15:59:13 -04:00
Vignesh Mohankumar
469a006088
fix: filter more CSP errors (#6839) 
* fix: filter more CSP errors

* fix regex

* fix
 2023-06-26 14:04:54 -04:00
Vignesh Mohankumar
c673c9e458
fix: filter user reject errors temporarily (#6840) 2023-06-26 13:41:17 -04:00
Vignesh Mohankumar
dd957d07e4
chore: upgrade @web3-react/walletconnect-v2 (#6842) 
* chore: upgrade @web3-react/walletconnect-v2

* fix typecheck
 2023-06-26 13:15:16 -04:00
Vignesh Mohankumar
3837ce24ac
revert: "feat(wallet-connect): retire v1" (#6841) 
Revert "feat(wallet-connect): retire v1 (#6820)"

This reverts commit d6759b86e3702a6da3df211752c06e4ee119d801.
 2023-06-26 12:43:16 -04:00
Jordan Frankfurt
d6759b86e3
feat(wallet-connect): retire v1 (#6820) 
* feat(wallet-connect): retire v1

* fix unit test

* Update src/state/user/reducer.ts

Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com>

* useToggleAccountDrawer

* fix test

---------

Co-authored-by: cartcrom <39385577+cartcrom@users.noreply.github.com>
 2023-06-23 15:12:21 -05:00
Jordan Frankfurt
df55456409
fix: chrome tie sort resolution (#6833) 2023-06-23 15:05:47 -05:00
Jack Short
f290787b99
fix: divide by zero error on pool page (#6837) 
* fix: divide by zero error on pool page

* removing changes here

* adding price in conditional

---------

Co-authored-by: John Short <john.short@CORN-Jack-899.local>
 2023-06-23 15:56:41 -04:00
Jack Short
ebab00d7bd
fix: adding wallet connect v2 behind feature flag (#6826) 
* fix: adding wallet connect v2 behind feature flag

* passing unit tests
 2023-06-22 16:16:41 -04:00
Brendan Wong
01dc10d4f3
fix: scroll behavior on MP on mobile (#6750) 
* fix: update overflow

* fix: add margin for mobile

* fix: update css to use built in styling
 2023-06-22 16:11:23 -04:00
Brendan Wong
fb3abf275e
fix: added op and arb as base tokens (#6810) 
* fix: added op and arb as base tokens

* fix: unit testing
 2023-06-22 16:10:49 -04:00
Vignesh Mohankumar
1bb750f136
feat: track quote method in Quote Received event (#6807) 
* WIP

* WIP

* more work

* comment

* fix

* v2slice

* add method to data

* add names

* fellback

* rm-log

* only success
 2023-06-22 14:19:23 -04:00
Zach Pomerantz
5315272694
chore: rm committed t9n (#6792) 
* chore: rm committed t9n

* chore: ignore t9n

* test(e2e): fix locale selection test
 2023-06-22 09:30:06 -04:00
Jordan Frankfurt
43b9e398b5
fix: allow more session namespace keys (#6802) 
* allow more session namespace keys

* pr feedback

* add test case
 2023-06-21 17:02:13 -05:00
eddie
1247989cf4
fix: cut off wallet icon (#6815) 2023-06-21 14:35:08 -07:00
Jordan Frankfurt
45a5ca3b88
feat: sort supported chains to top of the chain selector list (#6800) 
* feat: sort supported chains to top of the chain selector list

* pr feedback

---------

Co-authored-by: Jordan Frankfurt <jordan@CORN-Jordan-949.frankfurt>
 2023-06-21 16:10:46 -05:00
eddie
54b4567a81
test: add e2e test for usdt special case (#6784) 
* feat: revoke USDT approvals in ConfirmSwapModal

* chore: fix bad merge

* test: add e2e test for usdt special case

* fix: refactor test

* fix: make variable static

* fix: comments
 2023-06-21 14:02:14 -07:00
Jordan Frankfurt
fc45a504fb
fix: log the error message instead of [object Object] (#6773) 
* fix: log the error message instead of [object Object]

add tina's rec

pr review

zzmp input

* pr feedback
 2023-06-21 15:35:23 -05:00
eddie
052cc69414
feat: log minimum_output_after_slippage to amplitude (#6769) 
* feat: log minimum_output_after_slippage to amplitude

* fix: memoize logging props

* fix: dont memoize at all
 2023-06-21 10:22:48 -07:00
Zach Pomerantz
5caaaf1b1f
test(e2e): switching network (#6662) 
* test(e2e): switching network

Co-authored-by: Jordan Frankfurt <<jordan@CORN-Jordan-949.frankfurt>

* fix: reconnect after failed chain switch

* test(e2e): add forks to hardhat.config

* test(e2e): wait on wallet_switchEthereumChain

* build: upgrade cypress-hardhat

* fix: do not disconnect whilst switching

* fix: unit tests

* fix: better chain selector check

* test(e2e): better helper fn naming

* test(e2e): better stub naming

* fix: doc re-activation

* fix: add back click

* build: upgrade cypress-hardhat to include network caching

* unwrap web3status

---------

Co-authored-by: Jordan Frankfurt <<jordan@CORN-Jordan-949.frankfurt>
 2023-06-21 13:15:03 -04:00
Zach Pomerantz
342b0c81f6
chore: rm pseudo locale (#6794) 
chore: rm pseudo t9n
 2023-06-21 10:45:03 -04:00
Jordan Frankfurt
cb21750b87
fix: remove unused types (#6791) 
* fix: remove unused types

* update name
 2023-06-16 14:38:03 -05:00
Jordan Frankfurt
2e8ef480f9
feat(testnets): add toggle for testnets (#6786) 
* feat(testnets): add toggle for testnets

* e2e test

* update toggle syntax and fix a bug

* simplify list calculation per eddie's input

* add all testnets

* clean up the styles

* Update src/components/NavBar/ChainSelector.tsx

* fix lint
 2023-06-16 14:09:05 -05:00
Nate Wienert
f27bba9ffa
fix: use shortenAddress for mini portfolio addresses (#6774) 
* fix: use shortenAddress for mini portfolio addresses

* Update src/utils/addresses.ts

Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>

---------

Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
 2023-06-16 08:51:03 -10:00
eddie
6528fd136e
feat: log swap failures to amplitude (#6789) 2023-06-16 11:20:09 -07:00
Jordan Frankfurt
5bec0b78da
fix: update copy per Fred's input (#6787) 2023-06-16 12:46:59 -05:00
Vignesh Mohankumar
f3889e326e
chore: migrate from JIRA to Linear (#6747) 
* chore: migrate from JIRA to Linear

* INFRA -> WEB
 2023-06-16 12:48:27 -04:00
Jordan Frankfurt
2d61c72588
feat(wallet-connect): make v2 the default walletconnect method (#6785) 
* explicitly enumerate all supported wcv2 methods as optional ?

* use only sign methods in optionalMethods

* rename class

* feat(wallet-connect): make v2 the default

* fix loader and menu button occlusion

* fix test

* pr feedback from zzmp

* update connector name

* add slack convo link from x-walletconnect
 2023-06-16 11:33:37 -05:00
Brendan Wong
1a634c350a
fix: success indication for copy (#6711) 
* fix: success indication for copy

* fix: remove redundant styles
 2023-06-15 20:51:11 -04:00
eddie
35b83ab842
feat: revoke USDT approvals in ConfirmSwapModal (#6730) 2023-06-15 17:12:10 -07:00
eddie
c0d42ade6f
fix: clear dependent variable when trade inputs become invalid (#6782) 
* fix: handle polling interrupt separately from invalid trades

* fix: clear output when trade becomes invalid, dont use stale trade

* fix: tests

* fix: invert skip

* fix: remove debounce delay
 2023-06-15 16:05:57 -07:00
eddie
0e2344ba85
feat: refactor ConfirmSwapModal for clarity (#6729) 
* feat: refactor ConfirmSwapModal for clarity

* fix: remove reset effect for now

* fix: catchUserReject update

* fix: remove unnecessary awaits
 2023-06-15 15:31:41 -07:00
Tina
309d03b5e7
feat: Bump default auto-slippage to 0.5% (#6778) 
bump default to 0.5%
 2023-06-15 18:10:28 -04:00
Vignesh Mohankumar
8d32e315ed
feat: filter moz-extension errors (#6781) 2023-06-15 18:05:39 -04:00
Jack Short
1c8b3f0339
fix: currency select modal when chain is not supported (#6759) 
* fix: currency select modal when chain is not supported

* removing pay with if on unsupported network

* refactor
 2023-06-15 12:39:35 -04:00
eddie
fc83659041
fix: bottom padding on error modal (#6758) 2023-06-15 09:16:32 -07:00