From 8c20e698362ffaffb9b67848a420c40b9bdf5c9b Mon Sep 17 00:00:00 2001 From: Yosif Hamed Date: Thu, 27 Jun 2024 17:13:44 +0300 Subject: [PATCH 1/6] Fix transfer token via url --- src/components/Wallet/Transfer/Transfer.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/Wallet/Transfer/Transfer.js b/src/components/Wallet/Transfer/Transfer.js index 4c45146a7..702037cbd 100644 --- a/src/components/Wallet/Transfer/Transfer.js +++ b/src/components/Wallet/Transfer/Transfer.js @@ -1,4 +1,4 @@ -import { useLocation, withRouter, useParams } from 'react-router-dom' +import { useLocation, withRouter, useParams, useMemo } from 'react-router-dom' import { useEffect, useState } from 'react' import accountPresets from 'ambire-common/src/constants/accountPresets' import cn from 'classnames' @@ -25,6 +25,11 @@ const Transfer = (props) => { const [assetAddrWithSymbol, setAsset] = useState( selectedAsset && `${selectedAsset.address}:${selectedAsset.symbol}` ) + + useEffect(()=>{ + setAsset(selectedAsset && `${selectedAsset.address}:${selectedAsset.symbol}`) + }, [portfolio]) + const [gasTankDetails] = useState(state || null) const [address, setAddress] = useState(gasTankDetails ? accountPresets.feeCollector : '') From 85bd60c894dbf60bae0db7a89fe2d7592d509405 Mon Sep 17 00:00:00 2001 From: Yosif Hamed Date: Thu, 27 Jun 2024 17:15:37 +0300 Subject: [PATCH 2/6] remove unused import --- src/components/Wallet/Transfer/Transfer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Wallet/Transfer/Transfer.js b/src/components/Wallet/Transfer/Transfer.js index 702037cbd..3951d0e02 100644 --- a/src/components/Wallet/Transfer/Transfer.js +++ b/src/components/Wallet/Transfer/Transfer.js @@ -1,4 +1,4 @@ -import { useLocation, withRouter, useParams, useMemo } from 'react-router-dom' +import { useLocation, withRouter, useParams } from 'react-router-dom' import { useEffect, useState } from 'react' import accountPresets from 'ambire-common/src/constants/accountPresets' import cn from 'classnames' From 7adb1bc3cd9cd56029ab1567e04c0380e76676e9 Mon Sep 17 00:00:00 2001 From: Yosif Hamed Date: Fri, 28 Jun 2024 18:07:25 +0300 Subject: [PATCH 3/6] Update cypress test --- cypress/e2e/transfer.cy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/transfer.cy.ts b/cypress/e2e/transfer.cy.ts index 2acf8d43e..96c64b613 100644 --- a/cypress/e2e/transfer.cy.ts +++ b/cypress/e2e/transfer.cy.ts @@ -12,7 +12,7 @@ describe('Transfering funds', () => { it('Sends funds via Quick account', () => { cy.visit('/wallet/dashboards') - cy.contains('Transfer').click() + cy.contains('Send').click() // Wait for the initial wallet load. // There are a lot of fetch requests under the hood. From 139edf63bd5643632279755d4ec0b7cde8abfaed Mon Sep 17 00:00:00 2001 From: Yosif Hamed Date: Mon, 5 Aug 2024 17:12:31 +0300 Subject: [PATCH 4/6] Add comment --- cypress/e2e/transfer.cy.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/cypress/e2e/transfer.cy.ts b/cypress/e2e/transfer.cy.ts index 96c64b613..013531569 100644 --- a/cypress/e2e/transfer.cy.ts +++ b/cypress/e2e/transfer.cy.ts @@ -12,6 +12,7 @@ describe('Transfering funds', () => { it('Sends funds via Quick account', () => { cy.visit('/wallet/dashboards') + // Send button for first token in dashboard cy.contains('Send').click() // Wait for the initial wallet load. From 1c44de5d1bc759ca45554c2fbd296ad0f95e1773 Mon Sep 17 00:00:00 2001 From: Yosif Hamed Date: Wed, 7 Aug 2024 14:41:28 +0300 Subject: [PATCH 5/6] rerun test --- cypress/e2e/transfer.cy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/transfer.cy.ts b/cypress/e2e/transfer.cy.ts index 013531569..e927ebc22 100644 --- a/cypress/e2e/transfer.cy.ts +++ b/cypress/e2e/transfer.cy.ts @@ -12,7 +12,7 @@ describe('Transfering funds', () => { it('Sends funds via Quick account', () => { cy.visit('/wallet/dashboards') - // Send button for first token in dashboard + cy.contains('Send').click() // Wait for the initial wallet load. From 964155299b890c4f23c4cdd88d05724368aa1e62 Mon Sep 17 00:00:00 2001 From: Yosif Hamed Date: Wed, 7 Aug 2024 17:14:40 +0300 Subject: [PATCH 6/6] Fix test --- src/components/Wallet/Transfer/Transfer.test.jsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/Wallet/Transfer/Transfer.test.jsx b/src/components/Wallet/Transfer/Transfer.test.jsx index 4644cbbe1..8365a40b7 100644 --- a/src/components/Wallet/Transfer/Transfer.test.jsx +++ b/src/components/Wallet/Transfer/Transfer.test.jsx @@ -97,8 +97,11 @@ test('can send token', async () => { addressBook={addressBook} selectedAcc={userAddress} addRequest={addRequest} - /> - ) + />) + const selectAnAsset = screen.getByText('Select an asset') + await user.click(selectAnAsset) + const selectMatic = screen.getByText('MATIC') + await user.click(selectMatic) const maxButton = screen.getByText('MAX') await user.click(maxButton)