Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use Swap Component on TDP #6332

Merged
merged 39 commits into from
May 2, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
9698bd4
test: swap flow cypress tests
just-toby Apr 10, 2023
16dd116
fix: use default parameter
just-toby Apr 10, 2023
129b28a
feat: use Swap Component on TDP
just-toby Apr 11, 2023
7236cba
feat: auto nav for TDP tokens
just-toby Apr 11, 2023
29643f9
chore: merge
just-toby Apr 20, 2023
8a80368
chore: merge
just-toby Apr 20, 2023
0b68684
chore: merge
just-toby Apr 20, 2023
cab2b59
chore: merge
just-toby Apr 20, 2023
f5ab2b6
chore: merge
just-toby Apr 24, 2023
82ae506
chore: merge
just-toby Apr 24, 2023
275656e
fix: remove extra inputCurrency URL parsing logic
just-toby Apr 24, 2023
36a3a88
fix: undo last change
just-toby Apr 24, 2023
cc4fce9
fix: pass expected chain id to swap component
just-toby Apr 24, 2023
3c57ef8
fix: search for default tokens on unconnected networks if needed
just-toby Apr 24, 2023
8223dcd
test: e2e test for l2 token
just-toby Apr 24, 2023
15cac1f
fix: delete irrelevant tests
just-toby Apr 24, 2023
be8b155
fix: address comments
just-toby Apr 24, 2023
7408bc4
fix: lint error
just-toby Apr 24, 2023
18d9d83
test: update TDP e2e tests
just-toby Apr 24, 2023
9f3b158
fix: use pageChainId for filter
just-toby Apr 25, 2023
626234b
fix: rename chainId
just-toby Apr 25, 2023
8ddb100
fix: typecheck
just-toby Apr 25, 2023
aa51523
fix: chainId bug
just-toby Apr 25, 2023
8f2977a
chore: merge
just-toby Apr 25, 2023
ba7b6d3
fix: chainId required fixes
just-toby Apr 25, 2023
e49ee48
fix: bad merge in e2e test
just-toby Apr 26, 2023
21ee43e
chore: merge
just-toby Apr 26, 2023
e4c4e90
fix: remove unused test util
just-toby Apr 26, 2023
c3af201
fix: remove unnecessary variable
just-toby Apr 26, 2023
e7e2c38
fix: token defaults
just-toby Apr 26, 2023
9fb00db
chore: merge
just-toby Apr 26, 2023
a53d0a7
fix: address comments
just-toby Apr 27, 2023
3041007
fix: address comments and fix tests
just-toby Apr 27, 2023
74746f8
fix: e2e test formatting, remove Maybe<>
just-toby Apr 27, 2023
f09a181
fix: remove unused variable
just-toby Apr 27, 2023
022d132
chore: merge
just-toby Apr 28, 2023
05bc88e
fix: use feature flag for swap component on TDP
just-toby May 2, 2023
6f347a1
fix: back button
just-toby May 2, 2023
d131136
fix: merge
just-toby May 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: delete irrelevant tests
  • Loading branch information
just-toby committed Apr 24, 2023
commit 15cac1f78e4ec920e5f34936415576ebad04dd7b
108 changes: 0 additions & 108 deletions cypress/e2e/swap-widget.cy.ts

This file was deleted.

26 changes: 1 addition & 25 deletions cypress/e2e/token-details.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getClassContainsSelector, getTestSelector } from '../utils'
import { getTestSelector } from '../utils'

const UNI_ADDRESS = '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984'

Expand Down Expand Up @@ -89,28 +89,4 @@ describe('Token details', () => {
.should('include.text', 'Warning')
.and('include.text', "This token isn't traded on leading U.S. centralized exchanges")
})

describe('Swap on Token Detail Page', () => {
const verifyOutputToken = (outputText: string) => {
cy.get(getClassContainsSelector('TokenButtonRow')).last().contains(outputText)
}

beforeEach(() => {
// On mobile widths, we just link back to /swap instead of rendering the swap component.
cy.viewport(1200, 800)
cy.visit(`/tokens/goerli/${UNI_ADDRESS}`).then(() => {
cy.wait('@eth_blockNumber')
})
})

it('should have the expected output for a tokens detail page', () => {
verifyOutputToken('UNI')
})

it('should not share swap state with the main swap page', () => {
verifyOutputToken('UNI')
cy.visit('/swap')
cy.contains('UNI').should('not.exist')
})
})
})