feat: merge main

.env.sample

@@ -6,10 +6,10 @@ NEXT_PUBLIC_NODE_PRODUCTION=https://rpc.astranaut.dev
 NEXT_PUBLIC_HOST=http://localhost:3000
 NEXT_PUBLIC_EXPLORER=https://explorer.astranaut.dev
 NEXT_PUBLIC_GTAG=
-NEXT_PUBLIC_FEE=20
+NEXT_PUBLIC_FEE=100
 NEXT_PUBLIC_TITLE=SolarSwap
 NEXT_PUBLIC_WALLET_CONNECT_RELAY=relay.walletconnect.com
 NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID=af3dd8c81db591806b87e9dbdd42d470
-NEXT_PUBLIC_DEFAULT_OUTPUT_CURRENCY=0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2
-NEXT_PUBLIC_GN_INFO_CLIENT=http://167.172.80.21:8000/subgraphs/name/solarswap/exchange-v1
-NEXT_PUBLIC_GN_BLOCK_CLIENT=http://167.172.80.21:8000/subgraphs/name/solarswap/blocks-v1
+NEXT_PUBLIC_DEFAULT_OUTPUT_CURRENCY=0x2039A56173fDac411975Bce6F756059Ac33d0d79
+NEXT_PUBLIC_GN_INFO_CLIENT=https://graph-node.astranaut.dev/subgraphs/name/solarswap/exchange-v1
+NEXT_PUBLIC_GN_BLOCK_CLIENT=https://graph-node.astranaut.dev/subgraphs/name/solarswap/blocks-v1

.github/workflows/dev.yml

@@ -26,12 +26,12 @@ jobs:
         NEXT_PUBLIC_HOST=https://defi.astranaut.dev
         NEXT_PUBLIC_EXPLORER=http://explorer.astranaut.dev
         NEXT_PUBLIC_GTAG=''
-        NEXT_PUBLIC_FEE=20
+        NEXT_PUBLIC_FEE=100
         NEXT_PUBLIC_TITLE=SolarSwap
         NEXT_PUBLIC_WALLET_CONNECT_RELAY=relay.walletconnect.com
         NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID=af3dd8c81db591806b87e9dbdd42d670
         NEXT_PUBLIC_SENTRY_DSN=https://3440367258bb4aa39f6798ce548c98c8@sentry.astranet.live/5
         NEXT_PUBLIC_SENTRY_ENVIRONMENT=testnet
-        NEXT_PUBLIC_DEFAULT_OUTPUT_CURRENCY=0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2
-        NEXT_PUBLIC_GN_INFO_CLIENT=http://167.172.80.21:8000/subgraphs/name/solarswap/exchange-v1
-        NEXT_PUBLIC_GN_BLOCK_CLIENT=http://167.172.80.21:8000/subgraphs/name/solarswap/blocks-v1
+        NEXT_PUBLIC_DEFAULT_OUTPUT_CURRENCY=0x2039A56173fDac411975Bce6F756059Ac33d0d79
+        NEXT_PUBLIC_GN_INFO_CLIENT=https://graph-node.astranaut.dev/subgraphs/name/solarswap/exchange-v1
+        NEXT_PUBLIC_GN_BLOCK_CLIENT=https://graph-node.astranaut.dev/subgraphs/name/solarswap/blocks-v1

.github/workflows/main.yml

@@ -26,11 +26,11 @@ jobs:
         NEXT_PUBLIC_HOST=https://solarswap.io
         NEXT_PUBLIC_EXPLORER=http://explorer.astranaut.io
         NEXT_PUBLIC_GTAG=G-MK9VVY7GT5
-        NEXT_PUBLIC_FEE=20
+        NEXT_PUBLIC_FEE=100
         NEXT_PUBLIC_TITLE=SolarSwap
         NEXT_PUBLIC_WALLET_CONNECT_RELAY=wc-relay.astranaut.io
         NEXT_PUBLIC_SENTRY_DSN=https://3440367258bb4aa39f6798ce548c98c8@sentry.astranet.live/5
         NEXT_PUBLIC_SENTRY_ENVIRONMENT=mainnet
-        NEXT_PUBLIC_DEFAULT_OUTPUT_CURRENCY=0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2
-        NEXT_PUBLIC_GN_INFO_CLIENT=http://167.172.80.21:8000/subgraphs/name/solarswap/exchange-v1
-        NEXT_PUBLIC_GN_BLOCK_CLIENT=http://167.172.80.21:8000/subgraphs/name/solarswap/blocks-v1
+        NEXT_PUBLIC_DEFAULT_OUTPUT_CURRENCY=0x2039A56173fDac411975Bce6F756059Ac33d0d79
+        NEXT_PUBLIC_GN_INFO_CLIENT=https://graph-node.astranaut.io/subgraphs/name/solarswap/exchange-v1
+        NEXT_PUBLIC_GN_BLOCK_CLIENT=https://graph-node.astranaut.io/subgraphs/name/solarswap/blocks-v1

Dockerfile

@@ -31,9 +31,13 @@ ARG NEXT_PUBLIC_EXPLORER
 ARG NEXT_PUBLIC_GTAG
 ARG NEXT_PUBLIC_FEE
 ARG NEXT_PUBLIC_TITLE
+ARG NEXT_PUBLIC_DEFAULT_OUTPUT_CURRENCY
 ARG NEXT_PUBLIC_WALLET_CONNECT_RELAY
 ARG NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID
 ARG NEXT_PUBLIC_SENTRY_DSN
+ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
+ARG NEXT_PUBLIC_GN_INFO_CLIENT
+ARG NEXT_PUBLIC_GN_BLOCK_CLIENT
 
 COPY --from=deps /app/node_modules ./node_modules
 COPY --from=deps /app/src ./src
@@ -52,6 +56,10 @@ RUN SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN} \
     NEXT_PUBLIC_WALLET_CONNECT_RELAY=${NEXT_PUBLIC_WALLET_CONNECT_RELAY} \
     NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID=${NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID} \
     NEXT_PUBLIC_SENTRY_DSN=${NEXT_PUBLIC_SENTRY_DSN} \
+    NEXT_PUBLIC_SENTRY_ENVIRONMENT=${NEXT_PUBLIC_SENTRY_ENVIRONMENT} \
+    NEXT_PUBLIC_DEFAULT_OUTPUT_CURRENCY=${NEXT_PUBLIC_DEFAULT_OUTPUT_CURRENCY} \
+    NEXT_PUBLIC_GN_INFO_CLIENT=${NEXT_PUBLIC_GN_INFO_CLIENT} \
+    NEXT_PUBLIC_GN_BLOCK_CLIENT=${NEXT_PUBLIC_GN_BLOCK_CLIENT} \
     yarn build
 
 # Production image, copy all the files and run next

cypress/e2e/exchange/add-liquidity.cy.ts

@@ -3,28 +3,28 @@ describe('Add Liquidity', () => {
 
 	/**
 	 * Use contracts:
-	 * WASA: 0xC60F8AF409Eac14d4926e641170382f313749Fdc
-	 * USDT: 0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2
+	 * WASA: 0xA625BF1c3565775B1859B579DF980Fef324E7315
+	 * USDT: 0x2039A56173fDac411975Bce6F756059Ac33d0d79
 	 * TNT:  0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548
 	 * TNT2: 0xe65585B6Aa50f27d8C8aFac544c01d8668850f21
 	 */
 
 	/** Normal Add Liquidity */
 
 	it('loads the two correct tokens', () => {
-		cy.visit(`${HOST}/add/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`)
+		cy.visit(`${HOST}/add/0x2039A56173fDac411975Bce6F756059Ac33d0d79/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`)
 		cy.get('#add-liquidity-input-tokena #pair').should('contain.text', 'USDT')
 		cy.get('#add-liquidity-input-tokenb #pair').should('contain.text', 'TNT')
 	})
 
 	it('loads the ASA and tokens', () => {
-		cy.visit(`${HOST}/add/ASA/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`)
+		cy.visit(`${HOST}/add/ASA/0x2039A56173fDac411975Bce6F756059Ac33d0d79`)
 		cy.get('#add-liquidity-input-tokena #pair').should('contain.text', 'ASA')
 		cy.get('#add-liquidity-input-tokenb #pair').should('contain.text', 'USDT')
 	})
 
 	it('loads the WASA and tokens', () => {
-		cy.visit(`${HOST}/add/0xC60F8AF409Eac14d4926e641170382f313749Fdc/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`)
+		cy.visit(`${HOST}/add/0xA625BF1c3565775B1859B579DF980Fef324E7315/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`)
 		cy.get('#add-liquidity-input-tokena #pair').should('contain.text', 'WASA')
 		cy.get('#add-liquidity-input-tokenb #pair').should('contain.text', 'TNT')
 	})
@@ -50,65 +50,65 @@ describe('Add Liquidity', () => {
 	it('single token can be selected', () => {
 		cy.visit(`${HOST}/add/0xe65585B6Aa50f27d8C8aFac544c01d8668850f21`)
 		cy.get('#add-liquidity-input-tokena #pair').should('contain.text', 'TNT2')
-		cy.visit(`${HOST}/add/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`)
+		cy.visit(`${HOST}/add/0x2039A56173fDac411975Bce6F756059Ac33d0d79`)
 		cy.get('#add-liquidity-input-tokena #pair').should('contain.text', 'USDT')
 		cy.visit(`${HOST}/add/ASA`)
 		cy.get('#add-liquidity-input-tokena #pair').should('contain.text', 'ASA')
 	})
 
 	it('redirects /add/token-token to add/token/token', () => {
-		cy.visit(`${HOST}/add/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548-0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`)
+		cy.visit(`${HOST}/add/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548-0x2039A56173fDac411975Bce6F756059Ac33d0d79`)
 		cy.url().should(
 			'contain',
-			'/add/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2',
+			'/add/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548/0x2039A56173fDac411975Bce6F756059Ac33d0d79',
 		)
 	})
 
 	it('redirects /add/ASA-token to /add/ASA/token', () => {
-		cy.visit(`${HOST}/add/ASA-0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`)
-		cy.url().should('contain', '/add/ASA/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2')
+		cy.visit(`${HOST}/add/ASA-0x2039A56173fDac411975Bce6F756059Ac33d0d79`)
+		cy.url().should('contain', '/add/ASA/0x2039A56173fDac411975Bce6F756059Ac33d0d79')
 	})
 
 	it('redirects /add/token-ASA to /add/token/ASA', () => {
-		cy.visit(`${HOST}/add/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2-ASA`)
-		cy.url().should('contain', '/add/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2/ASA')
+		cy.visit(`${HOST}/add/0x2039A56173fDac411975Bce6F756059Ac33d0d79-ASA`)
+		cy.url().should('contain', '/add/0x2039A56173fDac411975Bce6F756059Ac33d0d79/ASA')
 	})
 
 	it('redirects /add/WASA-token to /add/WASA/token', () => {
-		cy.visit(`${HOST}/add/0xC60F8AF409Eac14d4926e641170382f313749Fdc-0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`)
+		cy.visit(`${HOST}/add/0xA625BF1c3565775B1859B579DF980Fef324E7315-0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`)
 		cy.url().should(
 			'contain',
-			'/add/0xC60F8AF409Eac14d4926e641170382f313749Fdc/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548',
+			'/add/0xA625BF1c3565775B1859B579DF980Fef324E7315/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548',
 		)
 	})
 
 	it('redirects /add/token-WASA to /add/token/WASA', () => {
-		cy.visit(`${HOST}/add/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548-0xC60F8AF409Eac14d4926e641170382f313749Fdc`)
+		cy.visit(`${HOST}/add/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548-0xA625BF1c3565775B1859B579DF980Fef324E7315`)
 		cy.url().should(
 			'contain',
-			'/add/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548/0xC60F8AF409Eac14d4926e641170382f313749Fdc',
+			'/add/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548/0xA625BF1c3565775B1859B579DF980Fef324E7315',
 		)
 	})
 
 	/** Single-sided Add Liquidity */
 
 	it('Single-sided - loads the two correct tokens', () => {
 		cy.visit(
-			`${HOST}/add-single/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`,
+			`${HOST}/add-single/0x2039A56173fDac411975Bce6F756059Ac33d0d79/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`,
 		)
 		cy.get('#add-liquidity-input-tokena #pair').should('contain.text', 'USDT')
 		cy.get('#add-liquidity-input-tokenb #pair').should('contain.text', 'TNT')
 	})
 
 	it('Single-sided - loads the ASA and tokens', () => {
-		cy.visit(`${HOST}/add-single/ASA/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`)
+		cy.visit(`${HOST}/add-single/ASA/0x2039A56173fDac411975Bce6F756059Ac33d0d79`)
 		cy.get('#add-liquidity-input-tokena #pair').should('contain.text', 'ASA')
 		cy.get('#add-liquidity-input-tokenb #pair').should('contain.text', 'USDT')
 	})
 
 	it('Single-sided - loads the WASA and tokens', () => {
 		cy.visit(
-			`${HOST}/add-single/0xC60F8AF409Eac14d4926e641170382f313749Fdc/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`,
+			`${HOST}/add-single/0xA625BF1c3565775B1859B579DF980Fef324E7315/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`,
 		)
 		cy.get('#add-liquidity-input-tokena #pair').should('contain.text', 'WASA')
 		cy.get('#add-liquidity-input-tokenb #pair').should('contain.text', 'TNT')
@@ -139,49 +139,49 @@ describe('Add Liquidity', () => {
 	it('Single-sided - single token can be selected', () => {
 		cy.visit(`${HOST}/add-single/0xe65585B6Aa50f27d8C8aFac544c01d8668850f21`)
 		cy.get('#add-liquidity-input-tokena #pair').should('contain.text', 'TNT2')
-		cy.visit(`${HOST}/add-single/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`)
+		cy.visit(`${HOST}/add-single/0x2039A56173fDac411975Bce6F756059Ac33d0d79`)
 		cy.get('#add-liquidity-input-tokena #pair').should('contain.text', 'USDT')
 		cy.visit(`${HOST}/add-single/ASA`)
 		cy.get('#add-liquidity-input-tokena #pair').should('contain.text', 'ASA')
 	})
 
 	it('Single-sided - redirects /add-single/token-token to add-single/token/token', () => {
 		cy.visit(
-			`${HOST}/add-single/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548-0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`,
+			`${HOST}/add-single/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548-0x2039A56173fDac411975Bce6F756059Ac33d0d79`,
 		)
 		cy.url().should(
 			'contain',
-			'/add/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2',
+			'/add/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548/0x2039A56173fDac411975Bce6F756059Ac33d0d79',
 		)
 	})
 
 	it('Single-sided - redirects /add-single/ASA-token to /add-single/ASA/token', () => {
-		cy.visit(`${HOST}/add-single/ASA-0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`)
-		cy.url().should('contain', '/add-single/ASA/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2')
+		cy.visit(`${HOST}/add-single/ASA-0x2039A56173fDac411975Bce6F756059Ac33d0d79`)
+		cy.url().should('contain', '/add-single/ASA/0x2039A56173fDac411975Bce6F756059Ac33d0d79')
 	})
 
 	it('Single-sided - redirects /add-single/token-ASA to /add-single/token/ASA', () => {
-		cy.visit(`${HOST}/add-single/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2-ASA`)
-		cy.url().should('contain', '/add-single/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2/ASA')
+		cy.visit(`${HOST}/add-single/0x2039A56173fDac411975Bce6F756059Ac33d0d79-ASA`)
+		cy.url().should('contain', '/add-single/0x2039A56173fDac411975Bce6F756059Ac33d0d79/ASA')
 	})
 
 	it('Single-sided - redirects /add-single/WASA-token to /add-single/WASA/token', () => {
 		cy.visit(
-			`${HOST}/add-single/0xC60F8AF409Eac14d4926e641170382f313749Fdc-0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`,
+			`${HOST}/add-single/0xA625BF1c3565775B1859B579DF980Fef324E7315-0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`,
 		)
 		cy.url().should(
 			'contain',
-			'/add/0xC60F8AF409Eac14d4926e641170382f313749Fdc/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548',
+			'/add/0xA625BF1c3565775B1859B579DF980Fef324E7315/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548',
 		)
 	})
 
 	it('Single-sided - redirects /add-single/token-WASA to /add-single/token/WASA', () => {
 		cy.visit(
-			`${HOST}/add-single/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548-0xC60F8AF409Eac14d4926e641170382f313749Fdc`,
+			`${HOST}/add-single/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548-0xA625BF1c3565775B1859B579DF980Fef324E7315`,
 		)
 		cy.url().should(
 			'contain',
-			'/add/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548/0xC60F8AF409Eac14d4926e641170382f313749Fdc',
+			'/add/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548/0xA625BF1c3565775B1859B579DF980Fef324E7315',
 		)
 	})
 })

cypress/e2e/exchange/remove-liquidity.cy.ts

@@ -3,36 +3,36 @@ describe('Remove Liquidity', () => {
 
 	/**
 	 * Use contracts:
-	 * WASA: 0xC60F8AF409Eac14d4926e641170382f313749Fdc
-	 * USDT: 0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2
+	 * WASA: 0xA625BF1c3565775B1859B579DF980Fef324E7315
+	 * USDT: 0x2039A56173fDac411975Bce6F756059Ac33d0d79
 	 * TNT:  0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548
 	 * TNT2: 0xe65585B6Aa50f27d8C8aFac544c01d8668850f21
 	 */
 
 	/** Normal Remove Liquidity */
 
 	it('redirects from address-address to address/address', () => {
-		cy.visit(`${HOST}/remove/0xC60F8AF409Eac14d4926e641170382f313749Fdc-0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`)
+		cy.visit(`${HOST}/remove/0xA625BF1c3565775B1859B579DF980Fef324E7315-0x2039A56173fDac411975Bce6F756059Ac33d0d79`)
 		cy.url().should(
 			'contain',
-			'/remove/0xC60F8AF409Eac14d4926e641170382f313749Fdc/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2',
+			'/remove/0xA625BF1c3565775B1859B579DF980Fef324E7315/0x2039A56173fDac411975Bce6F756059Ac33d0d79',
 		)
 	})
 
 	it('asa-usdt remove', () => {
-		cy.visit(`${HOST}/remove/ASA/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`)
+		cy.visit(`${HOST}/remove/ASA/0x2039A56173fDac411975Bce6F756059Ac33d0d79`)
 		cy.get('#remove-liquidity-tokena-symbol').should('contain.text', 'ASA')
 		cy.get('#remove-liquidity-tokenb-symbol').should('contain.text', 'USDT')
 	})
 
 	it('usdt-asa remove', () => {
-		cy.visit(`${HOST}/remove/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2/ASA`)
+		cy.visit(`${HOST}/remove/0x2039A56173fDac411975Bce6F756059Ac33d0d79/ASA`)
 		cy.get('#remove-liquidity-tokena-symbol').should('contain.text', 'USDT')
 		cy.get('#remove-liquidity-tokenb-symbol').should('contain.text', 'ASA')
 	})
 
 	it('loads the two correct tokens', () => {
-		cy.visit(`${HOST}/remove/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`)
+		cy.visit(`${HOST}/remove/0x2039A56173fDac411975Bce6F756059Ac33d0d79/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`)
 		cy.get('#remove-liquidity-tokena-symbol').should('contain.text', 'USDT')
 		cy.get('#remove-liquidity-tokenb-symbol').should('contain.text', 'TNT')
 	})
@@ -44,13 +44,13 @@ describe('Remove Liquidity', () => {
 	})
 
 	it('does not crash if token is duplicated', () => {
-		cy.visit(`${HOST}/remove/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`)
+		cy.visit(`${HOST}/remove/0x2039A56173fDac411975Bce6F756059Ac33d0d79/0x2039A56173fDac411975Bce6F756059Ac33d0d79`)
 		cy.get('#remove-liquidity-tokena-symbol').should('contain.text', 'USDT')
 		cy.get('#remove-liquidity-tokenb-symbol').should('contain.text', 'USDT')
 	})
 
 	it('token not in storage is loaded', () => {
-		cy.visit(`${HOST}/remove/0xe65585B6Aa50f27d8C8aFac544c01d8668850f21/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`)
+		cy.visit(`${HOST}/remove/0xe65585B6Aa50f27d8C8aFac544c01d8668850f21/0x2039A56173fDac411975Bce6F756059Ac33d0d79`)
 		cy.get('#remove-liquidity-tokena-symbol').should('contain.text', 'TNT2')
 		cy.get('#remove-liquidity-tokenb-symbol').should('contain.text', 'USDT')
 	})
@@ -59,27 +59,27 @@ describe('Remove Liquidity', () => {
 
 	it('Single-sided - redirects from address-address to address/address', () => {
 		cy.visit(
-			`${HOST}/remove-single/0xC60F8AF409Eac14d4926e641170382f313749Fdc-0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`,
+			`${HOST}/remove-single/0xA625BF1c3565775B1859B579DF980Fef324E7315-0x2039A56173fDac411975Bce6F756059Ac33d0d79`,
 		)
 		cy.url().should(
 			'contain',
-			'/remove/0xC60F8AF409Eac14d4926e641170382f313749Fdc/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2',
+			'/remove/0xA625BF1c3565775B1859B579DF980Fef324E7315/0x2039A56173fDac411975Bce6F756059Ac33d0d79',
 		)
 	})
 
 	it('Single-sided - asa-usdt remove', () => {
-		cy.visit(`${HOST}/remove-single/ASA/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`)
+		cy.visit(`${HOST}/remove-single/ASA/0x2039A56173fDac411975Bce6F756059Ac33d0d79`)
 		cy.get('#remove-liquidity-tokena-symbol').should('contain.text', 'ASA')
 	})
 
 	it('Single-sided - usdt-asa remove', () => {
-		cy.visit(`${HOST}/remove-single/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2/ASA`)
+		cy.visit(`${HOST}/remove-single/0x2039A56173fDac411975Bce6F756059Ac33d0d79/ASA`)
 		cy.get('#remove-liquidity-tokena-symbol').should('contain.text', 'USDT')
 	})
 
 	it('Single-sided - loads the two correct tokens', () => {
 		cy.visit(
-			`${HOST}/remove-single/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`,
+			`${HOST}/remove-single/0x2039A56173fDac411975Bce6F756059Ac33d0d79/0xEC846C99BB9Cb375DeC6c6E07DA0F35258F22548`,
 		)
 		cy.get('#remove-liquidity-tokena-symbol').should('contain.text', 'USDT')
 	})
@@ -91,14 +91,14 @@ describe('Remove Liquidity', () => {
 
 	it('Single-sided - does not crash if token is duplicated', () => {
 		cy.visit(
-			`${HOST}/remove-single/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`,
+			`${HOST}/remove-single/0x2039A56173fDac411975Bce6F756059Ac33d0d79/0x2039A56173fDac411975Bce6F756059Ac33d0d79`,
 		)
 		cy.get('#remove-liquidity-tokena-symbol').should('contain.text', 'USDT')
 	})
 
 	it('Single-sided - token not in storage is loaded', () => {
 		cy.visit(
-			`${HOST}/remove-single/0xe65585B6Aa50f27d8C8aFac544c01d8668850f21/0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2`,
+			`${HOST}/remove-single/0xe65585B6Aa50f27d8C8aFac544c01d8668850f21/0x2039A56173fDac411975Bce6F756059Ac33d0d79`,
 		)
 		cy.get('#remove-liquidity-tokena-symbol').should('contain.text', 'TNT2')
 	})

cypress/e2e/exchange/swap.cy.ts

@@ -4,7 +4,7 @@ describe('Swap', () => {
 		cy.visit(`${HOST}/swap`)
 	})
 	const delay = 200
-	const usdt = '0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2'
+	const usdt = '0x2039A56173fDac411975Bce6F756059Ac33d0d79'
 	// const busd = '0x092d93f258ceea20c94ba01e8771115141dd7c20'
 	// it('can enter an amount into input', () => {
 	// 	cy.get('#swap-currency-input .token-amount-input').type('0.001', { delay }).should('have.value', '0.001')
@@ -42,7 +42,7 @@ describe('Swap', () => {
 		cy.get('#swap-currency-input .token-amount-input').type('0.001', { force: true, delay })
 		cy.get('#swap-currency-output').should('not.equal', '')
 		cy.get('#swap-button').click()
-		cy.get('#confirm-swap-or-send').should('contain', 'Xác nhận Hoán đổi')
+		cy.get('#confirm-swap-or-send').should('contain', 'Xác nhận đổi điểm')
 	})
 
 	it('add a recipient does not exist unless in expert mode', () => {

cypress/integration/exchange/swap.test.ts

@@ -42,7 +42,7 @@ describe('Swap', () => {
 	})
 
 	it('should get input and output currency from url params', () => {
-		cy.visit('/swap?inputCurrency=0x6f74f5511ba144990A8aeBaF20AFBD3B56EedCb2&outputCurrency=ASA')
+		cy.visit('/swap?inputCurrency=0x2039A56173fDac411975Bce6F756059Ac33d0d79&outputCurrency=ASA')
 		cy.get('#swap-currency-input #pair').should('contain', 'BUSD')
 		cy.get('#swap-currency-output #pair').should('contain', 'ASA')
 	})