eddie
3e67982bb4
fix: reset USDT logic ( #7219 )
2023-08-23 16:09:07 -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
Zach Pomerantz
7978ed97a9
test(cypress): clean up types/assumptions/infura ( #7046 )
2023-08-01 22:13:19 -07:00
Zach Pomerantz
6a3abbfb56
fix: update mainnet block ( #7042 )
...
* fix: update mainnet block
* fix: typecheck
2023-07-27 15:40:10 -07: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
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
eddie
98f4af55c9
fix: stop resetting modal when we interrupt quote polling ( #6695 )
...
* test(e2e): disable video compression
* refactor: improve popupList impl/test
* test(e2e): log JSON-RPC calls
* fix: retry backoff logic
* test(e2e): wait for hardhat/popup assertions
* fix: remove transactions after expired
* test(e2e): re-enable other swap tests
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
* chore: rm console.log
* fix: expire txs after 6h
* refactor: dry trade info
* test(e2e): use default deadline
* test(e2e): use aliases for permit2 test
* test(e2e): automine/off in beforeEach
* test(e2e): rm intermediate screen with no pause
* fix: stop resetting modal when we interrupt quote polling'
* feat: add e2e test for window losing focus
* fix: move test
* fix: combine tests
---------
Co-authored-by: Zach Pomerantz <zzmp@uniswap.org>
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
2023-06-08 13:44:47 -07:00
Zach Pomerantz
088f1d9ae4
test(e2e): use aliases for permit2 test ( #6656 )
...
* test(e2e): disable video compression
* refactor: improve popupList impl/test
* test(e2e): log JSON-RPC calls
* fix: retry backoff logic
* test(e2e): wait for hardhat/popup assertions
* fix: remove transactions after expired
* test(e2e): re-enable other swap tests
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
* chore: rm console.log
* fix: expire txs after 6h
* refactor: dry trade info
* test(e2e): use default deadline
* test(e2e): use aliases for permit2 test
* test(e2e): automine/off in beforeEach
* test(e2e): rm intermediate screen with no pause
* fix merge
* fix only
---------
Co-authored-by: Jordan Frankfurt <jordanwfrankfurt@gmail.com>
2023-06-07 17:55:27 -07:00
eddie
41219b435f
feat: update content in permit2 flow ( #6699 )
2023-06-06 13:30:06 -07:00
eddie
379437b720
fix: remove all references to expert mode ( #6675 )
2023-06-01 12:04:16 -07:00
eddie
87cbd1ab38
fix: use ConfirmSwapModal in expert mode ( #6673 )
...
Fixes the swap flow for users who are still in expert mode and need permit2 approvals for a token
### test plan
added e2e test for full permit2 flow with expert mode enabled.
failing test without the change:
<img width="1394" alt="Screenshot 2023-05-31 at 2 24 12 PM" src="https://github.com/Uniswap/interface/assets/66155195/6a39e039-31b5-4bce-91d2-5e3ebc777378 ">
passing test with change in the CI of this PR
2023-05-31 14:52:04 -07:00
eddie
e2dd78fd0e
fix: design nits on summary view ( #6623 )
...
* fix: chainId required fixes
* fix: bad merge in e2e test
* fix: remove unused test util
* fix: remove unnecessary variable
* fix: token defaults
* fix: address comments
* fix: address comments and fix tests
* fix: e2e test formatting, remove Maybe<>
* fix: remove unused variable
* fix: use feature flag for swap component on TDP
* fix: back button
* feat: copy review screen UI from widgetg
* fix: modal padding
* feat: add final detail row
* fix: remove widget comment
* fix: update unit tests
* fix: code style consistency
* fix: remove padding from AutoColumn
* fix: update snapshots
* fix: use semantic gaps
* fix: more px and gaps
* fix: design feedbacks
* fix: button radius in summary modal
* fix: design nits
* feat: update design of summary modal
* fix: font weight and vertical spacing
* fix: update snapshots
* fix: css nits
* wip: move approval to summary modal
* wip: not working
* feat: working
* fix: fix flow
* feat: simplify states and build new modal UI
* feat: todos and differs fix
* feat: update tx status modal
* feat: split up approve and permit
* feat: error state
* feat: update success and error states
* feat: undo changes to TxConfirmationModal
* feat: re-order functions
* wip: move approval to summary modal
* wip: not working
* feat: update permit2 e2e tests
* feat: tests passing
* fix: swap test
* fix: bad merge
* wip: move approval to summary modal
* wip: not working
* feat: PendingModalContent tests
* feat: useMaxAmountIn
* fix: bad merge
* fix: naming
* fix: modal flicker when refetching trade
* wip: move approval to summary modal
* wip: not working
* feat: working
* fix: fix flow
* feat: simplify states and build new modal UI
* feat: todos and differs fix
* feat: update tx status modal
* feat: split up approve and permit
* feat: error state
* feat: update success and error states
* feat: undo changes to TxConfirmationModal
* feat: remove step indicators when only one step
* feat: move content into PendingModalContent component
* fix: lint
* chore: merge
* fix: update tests for new modal
* feat: add l2 chain logo to modal
* feat: add unit test
* fix: correct modal state when moving between steps
* fix: correct modal state when moving between steps
* fix: proper error handling of user rejection of swap
* feat: update e2e test
* fix: typecheck
* feat: design updates, state updates
* fix: comments
* fix: code style improvements
* feat: require trade to be defined
* fix: remove extra props from ThemedTexts
* fix: one more trans
* fix: remove unused export
* feat: remove undefined checks and other fixes
* fix: update test
* fix: add missing dollar sign
* fix: remove null check and update test
* fix: remove max width from detail row value
* fix: remove isOpen prop
* fix: isopen
* feat: refactor approval flow into a hook
* fix: custom error type
* fix: testid fix
* fix: text colors
* fix: add comment
* wip: permit2 modal animations
* fix: entrance animations
* feat: step indicator transitions
* feat: icon aniamtions
* feat: fix spinner icon
* fix: re-organize new code
* fix: svg import
* fix: tradeMeaningfullyDiffers improvement and prepareFlow fix
* fix: address comments
* fix: headerContent prop
* fix: change tooltip to external link
* feat: add comments explaining async state
* fix: test updates
* fix: nits
* fix: design nits
* fix: reduce nesting
* fix: address comments
* test: remove line from test for debugging
* fix: update tests
* fix: address comments
* fix: comments
* fix: update tests
* fix: update tests
* fix: more nesting in test
* feat: correct help center article
* fix: design nits on summary view
* fix: update test
* fix: update snapshots
* fix: update e2e test
* fix: etherscan link
* fix: update error test
* fix: dont show loader unless onchain processing is happening
* fix: update designs and add comments
* fix: update content in test
* fix: update tests more
* fix: test
* fix: reorganize test code
* fix: sentence case in one more test
* fix: mainnet loading indicator on last step
* fix: re-use opacity css code
* fix: testid issue with test
* fix: update copy
* fix: update strings in test
* fix: lint
* fix: modal height and css improvements
* fix: empty
* fix: padding on l2 badge
* fix: lint
2023-05-25 15:57:13 -07:00
eddie
dd29c59238
feat: permit2 animations WEB-2036 ( #6590 )
...
* test: swap flow cypress tests
* fix: use default parameter
* feat: use Swap Component on TDP
* feat: auto nav for TDP tokens
* chore: merge
* chore: merge
* chore: merge
* chore: merge
* fix: remove extra inputCurrency URL parsing logic
* fix: undo last change
* fix: pass expected chain id to swap component
* fix: search for default tokens on unconnected networks if needed
* test: e2e test for l2 token
* fix: delete irrelevant tests
* fix: address comments
* fix: lint error
* test: update TDP e2e tests
* fix: use pageChainId for filter
* fix: rename chainId
* fix: typecheck
* fix: chainId bug
* fix: chainId required fixes
* fix: bad merge in e2e test
* fix: remove unused test util
* fix: remove unnecessary variable
* fix: token defaults
* fix: address comments
* fix: address comments and fix tests
* fix: e2e test formatting, remove Maybe<>
* fix: remove unused variable
* fix: use feature flag for swap component on TDP
* fix: back button
* feat: copy review screen UI from widgetg
* fix: modal padding
* feat: add final detail row
* fix: remove widget comment
* fix: update unit tests
* fix: code style consistency
* fix: remove padding from AutoColumn
* fix: update snapshots
* fix: use semantic gaps
* fix: more px and gaps
* fix: design feedbacks
* fix: button radius in summary modal
* fix: design nits
* feat: update design of summary modal
* fix: font weight and vertical spacing
* fix: update snapshots
* fix: css nits
* wip: move approval to summary modal
* wip: not working
* feat: working
* fix: fix flow
* feat: simplify states and build new modal UI
* feat: todos and differs fix
* feat: update tx status modal
* feat: split up approve and permit
* feat: error state
* feat: update success and error states
* feat: undo changes to TxConfirmationModal
* feat: re-order functions
* wip: move approval to summary modal
* wip: not working
* feat: update permit2 e2e tests
* feat: tests passing
* fix: swap test
* fix: bad merge
* wip: move approval to summary modal
* wip: not working
* feat: PendingModalContent tests
* feat: useMaxAmountIn
* fix: bad merge
* fix: naming
* fix: modal flicker when refetching trade
* wip: move approval to summary modal
* wip: not working
* feat: working
* fix: fix flow
* feat: simplify states and build new modal UI
* feat: todos and differs fix
* feat: update tx status modal
* feat: split up approve and permit
* feat: error state
* feat: update success and error states
* feat: undo changes to TxConfirmationModal
* feat: remove step indicators when only one step
* feat: move content into PendingModalContent component
* fix: lint
* chore: merge
* fix: update tests for new modal
* feat: add l2 chain logo to modal
* feat: add unit test
* fix: correct modal state when moving between steps
* fix: correct modal state when moving between steps
* fix: proper error handling of user rejection of swap
* feat: update e2e test
* fix: typecheck
* feat: design updates, state updates
* fix: comments
* fix: code style improvements
* feat: require trade to be defined
* fix: remove extra props from ThemedTexts
* fix: one more trans
* fix: remove unused export
* feat: remove undefined checks and other fixes
* fix: update test
* fix: add missing dollar sign
* fix: remove null check and update test
* fix: remove max width from detail row value
* fix: remove isOpen prop
* fix: isopen
* feat: refactor approval flow into a hook
* fix: custom error type
* fix: testid fix
* fix: text colors
* fix: add comment
* wip: permit2 modal animations
* fix: entrance animations
* feat: step indicator transitions
* feat: icon aniamtions
* feat: fix spinner icon
* fix: re-organize new code
* fix: svg import
* fix: tradeMeaningfullyDiffers improvement and prepareFlow fix
* fix: address comments
* fix: headerContent prop
* fix: change tooltip to external link
* feat: add comments explaining async state
* fix: test updates
* fix: nits
* fix: design nits
* fix: reduce nesting
* fix: address comments
* test: remove line from test for debugging
* fix: update tests
* fix: address comments
* fix: comments
* fix: update tests
* fix: update tests
* fix: more nesting in test
* fix: update test
* fix: update e2e test
* fix: update error test
* fix: dont show loader unless onchain processing is happening
* fix: update designs and add comments
* fix: update content in test
* fix: update tests more
* fix: reorganize test code
* fix: mainnet loading indicator on last step
* fix: re-use opacity css code
* fix: testid issue with test
* fix: lint
* fix: modal height and css improvements
* fix: empty
2023-05-25 15:25:07 -07:00
eddie
8c2a0f1905
feat: update content in Swap Submission Modal ( #6577 )
...
* test: swap flow cypress tests
* fix: use default parameter
* feat: use Swap Component on TDP
* feat: auto nav for TDP tokens
* chore: merge
* chore: merge
* chore: merge
* chore: merge
* fix: remove extra inputCurrency URL parsing logic
* fix: undo last change
* fix: pass expected chain id to swap component
* fix: search for default tokens on unconnected networks if needed
* test: e2e test for l2 token
* fix: delete irrelevant tests
* fix: address comments
* fix: lint error
* test: update TDP e2e tests
* fix: use pageChainId for filter
* fix: rename chainId
* fix: typecheck
* fix: chainId bug
* fix: chainId required fixes
* fix: bad merge in e2e test
* fix: remove unused test util
* fix: remove unnecessary variable
* fix: token defaults
* fix: address comments
* fix: address comments and fix tests
* fix: e2e test formatting, remove Maybe<>
* fix: remove unused variable
* fix: use feature flag for swap component on TDP
* fix: back button
* feat: copy review screen UI from widgetg
* fix: modal padding
* feat: add final detail row
* fix: remove widget comment
* fix: update unit tests
* fix: code style consistency
* fix: remove padding from AutoColumn
* fix: update snapshots
* fix: use semantic gaps
* fix: more px and gaps
* fix: design feedbacks
* fix: button radius in summary modal
* fix: design nits
* feat: update design of summary modal
* fix: font weight and vertical spacing
* fix: update snapshots
* fix: css nits
* wip: move approval to summary modal
* wip: not working
* feat: working
* fix: fix flow
* feat: simplify states and build new modal UI
* feat: todos and differs fix
* feat: update tx status modal
* feat: split up approve and permit
* feat: error state
* feat: update success and error states
* feat: undo changes to TxConfirmationModal
* feat: re-order functions
* wip: move approval to summary modal
* wip: not working
* feat: update permit2 e2e tests
* feat: tests passing
* fix: swap test
* fix: bad merge
* wip: move approval to summary modal
* wip: not working
* feat: PendingModalContent tests
* feat: useMaxAmountIn
* fix: bad merge
* fix: naming
* fix: modal flicker when refetching trade
* wip: move approval to summary modal
* wip: not working
* feat: working
* fix: fix flow
* feat: simplify states and build new modal UI
* feat: todos and differs fix
* feat: update tx status modal
* feat: split up approve and permit
* feat: error state
* feat: update success and error states
* feat: undo changes to TxConfirmationModal
* feat: remove step indicators when only one step
* feat: move content into PendingModalContent component
* fix: lint
* chore: merge
* fix: update tests for new modal
* feat: add l2 chain logo to modal
* feat: add unit test
* fix: correct modal state when moving between steps
* fix: correct modal state when moving between steps
* fix: proper error handling of user rejection of swap
* feat: update e2e test
* fix: typecheck
* feat: design updates, state updates
* fix: comments
* fix: code style improvements
* feat: require trade to be defined
* fix: remove extra props from ThemedTexts
* fix: one more trans
* fix: remove unused export
* feat: remove undefined checks and other fixes
* fix: update test
* fix: add missing dollar sign
* fix: remove null check and update test
* fix: remove max width from detail row value
* fix: remove isOpen prop
* fix: isopen
* feat: refactor approval flow into a hook
* fix: custom error type
* fix: testid fix
* fix: text colors
* fix: add comment
* fix: tradeMeaningfullyDiffers improvement and prepareFlow fix
* fix: address comments
* fix: headerContent prop
* fix: change tooltip to external link
* feat: add comments explaining async state
* fix: test updates
* fix: nits
* fix: reduce nesting
* fix: address comments
* test: remove line from test for debugging
* fix: update tests
* fix: address comments
* fix: comments
* fix: update tests
* fix: update tests
* fix: more nesting in test
* fix: update test
* fix: update e2e test
* fix: update error test
* fix: update content in test
* fix: reorganize test code
2023-05-25 14:57:04 -07:00
eddie
682fba219d
feat: swap rejection error handling ( #6576 )
...
* test: swap flow cypress tests
* fix: use default parameter
* feat: use Swap Component on TDP
* feat: auto nav for TDP tokens
* chore: merge
* chore: merge
* chore: merge
* chore: merge
* fix: remove extra inputCurrency URL parsing logic
* fix: undo last change
* fix: pass expected chain id to swap component
* fix: search for default tokens on unconnected networks if needed
* test: e2e test for l2 token
* fix: delete irrelevant tests
* fix: address comments
* fix: lint error
* test: update TDP e2e tests
* fix: use pageChainId for filter
* fix: rename chainId
* fix: typecheck
* fix: chainId bug
* fix: chainId required fixes
* fix: bad merge in e2e test
* fix: remove unused test util
* fix: remove unnecessary variable
* fix: token defaults
* fix: address comments
* fix: address comments and fix tests
* fix: e2e test formatting, remove Maybe<>
* fix: remove unused variable
* fix: use feature flag for swap component on TDP
* fix: back button
* feat: copy review screen UI from widgetg
* fix: modal padding
* feat: add final detail row
* fix: remove widget comment
* fix: update unit tests
* fix: code style consistency
* fix: remove padding from AutoColumn
* fix: update snapshots
* fix: use semantic gaps
* fix: more px and gaps
* fix: design feedbacks
* fix: button radius in summary modal
* fix: design nits
* feat: update design of summary modal
* fix: font weight and vertical spacing
* fix: update snapshots
* fix: css nits
* wip: move approval to summary modal
* wip: not working
* feat: working
* fix: fix flow
* feat: simplify states and build new modal UI
* feat: todos and differs fix
* feat: update tx status modal
* feat: split up approve and permit
* feat: error state
* feat: update success and error states
* feat: undo changes to TxConfirmationModal
* feat: re-order functions
* wip: move approval to summary modal
* wip: not working
* feat: update permit2 e2e tests
* feat: tests passing
* fix: swap test
* fix: bad merge
* wip: move approval to summary modal
* wip: not working
* feat: PendingModalContent tests
* feat: useMaxAmountIn
* fix: bad merge
* fix: naming
* fix: modal flicker when refetching trade
* wip: move approval to summary modal
* wip: not working
* feat: working
* fix: fix flow
* feat: simplify states and build new modal UI
* feat: todos and differs fix
* feat: update tx status modal
* feat: split up approve and permit
* feat: error state
* feat: update success and error states
* feat: undo changes to TxConfirmationModal
* feat: remove step indicators when only one step
* feat: move content into PendingModalContent component
* fix: lint
* chore: merge
* fix: update tests for new modal
* feat: add l2 chain logo to modal
* feat: add unit test
* fix: correct modal state when moving between steps
* fix: correct modal state when moving between steps
* fix: proper error handling of user rejection of swap
* feat: update e2e test
* fix: typecheck
* fix: comments
* fix: code style improvements
* feat: require trade to be defined
* fix: remove extra props from ThemedTexts
* fix: one more trans
* fix: remove unused export
* feat: remove undefined checks and other fixes
* fix: update test
* fix: add missing dollar sign
* fix: remove null check and update test
* fix: remove max width from detail row value
* fix: remove isOpen prop
* fix: isopen
* feat: refactor approval flow into a hook
* fix: custom error type
* fix: testid fix
* fix: add comment
* fix: tradeMeaningfullyDiffers improvement and prepareFlow fix
* fix: address comments
* fix: headerContent prop
* feat: add comments explaining async state
* fix: test updates
* fix: nits
* fix: reduce nesting
* fix: address comments
* test: remove line from test for debugging
* fix: update tests
* fix: address comments
* fix: update tests
* fix: more nesting in test
* fix: update test
* fix: update e2e test
* fix: update error test
* fix: reorganize test code
2023-05-25 14:56:37 -07:00
eddie
7934777fa2
feat: permit2 flow updates ( #6538 )
...
* test: swap flow cypress tests
* fix: use default parameter
* feat: use Swap Component on TDP
* feat: auto nav for TDP tokens
* chore: merge
* chore: merge
* chore: merge
* chore: merge
* fix: remove extra inputCurrency URL parsing logic
* fix: undo last change
* fix: pass expected chain id to swap component
* fix: search for default tokens on unconnected networks if needed
* test: e2e test for l2 token
* fix: delete irrelevant tests
* fix: address comments
* fix: lint error
* test: update TDP e2e tests
* fix: use pageChainId for filter
* fix: rename chainId
* fix: typecheck
* fix: chainId bug
* fix: chainId required fixes
* fix: bad merge in e2e test
* fix: remove unused test util
* fix: remove unnecessary variable
* fix: token defaults
* fix: address comments
* fix: address comments and fix tests
* fix: e2e test formatting, remove Maybe<>
* fix: remove unused variable
* fix: use feature flag for swap component on TDP
* fix: back button
* feat: copy review screen UI from widgetg
* fix: modal padding
* feat: add final detail row
* fix: remove widget comment
* fix: update unit tests
* fix: code style consistency
* fix: remove padding from AutoColumn
* fix: update snapshots
* fix: use semantic gaps
* fix: more px and gaps
* fix: design feedbacks
* fix: button radius in summary modal
* fix: design nits
* feat: update design of summary modal
* fix: font weight and vertical spacing
* fix: update snapshots
* fix: css nits
* fix: modal flicker when refetching trade
* wip: move approval to summary modal
* wip: not working
* feat: working
* fix: fix flow
* feat: simplify states and build new modal UI
* feat: todos and differs fix
* feat: update tx status modal
* feat: split up approve and permit
* feat: error state
* feat: update success and error states
* feat: undo changes to TxConfirmationModal
* feat: remove step indicators when only one step
* feat: move content into PendingModalContent component
* fix: lint
* fix: correct modal state when moving between steps
* fix: comments
* fix: code style improvements
* feat: require trade to be defined
* fix: remove extra props from ThemedTexts
* fix: one more trans
* fix: remove unused export
* feat: remove undefined checks and other fixes
* fix: update test
* fix: add missing dollar sign
* fix: remove null check and update test
* fix: remove max width from detail row value
* fix: remove isOpen prop
* fix: isopen
* feat: refactor approval flow into a hook
* fix: tradeMeaningfullyDiffers improvement and prepareFlow fix
* fix: address comments
* feat: add comments explaining async state
* fix: nits
* fix: address comments
* feat: permit2 e2e tests (#6541 )
* wip: move approval to summary modal
* wip: not working
* feat: working
* fix: fix flow
* feat: simplify states and build new modal UI
* feat: todos and differs fix
* feat: update tx status modal
* feat: split up approve and permit
* feat: error state
* feat: update success and error states
* feat: undo changes to TxConfirmationModal
* feat: re-order functions
* wip: move approval to summary modal
* wip: not working
* feat: update permit2 e2e tests
* feat: tests passing
* fix: swap test
* fix: bad merge
* chore: merge
* fix: update tests for new modal
* fix: testid fix
* fix: test updates
* fix: reduce nesting
* test: remove line from test for debugging
* fix: update tests
* fix: more nesting in test
* fix: update test
* fix: reorganize test code
2023-05-25 13:49:27 -07:00
eddie
719ee0f5b5
fix: loosen permit2 expiration tolerance in e2e tests ( #6573 )
2023-05-15 10:58:05 -07:00
cartcrom
406893d99a
test(e2e): permit2 approval ( #6488 )
...
* build: upgrade cypress-hardhat
* test: reset hardhat between tests
* test: enable auto-mining
* build: upgrade cypress-hardhat again
* test: permit2 e2e tests
* test: user approval rejection
* refactor: reuse common permit util vars to reduce # of lines
* fix: var casing
* refactor: polish
* refactor: clean up comments and function names
* refactor: remove approval util and update scoping
* fix: further nits
2023-05-05 17:52:22 -04:00
