From 81a196b3a2ef53b34b5581f954f702ff2670a379 Mon Sep 17 00:00:00 2001 From: Veado Date: Mon, 29 Nov 2021 17:08:06 +0100 Subject: [PATCH 1/2] Reset user inputs while changing wallet type Part of #1926 --- .../components/deposit/add/SymDeposit.tsx | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/src/renderer/components/deposit/add/SymDeposit.tsx b/src/renderer/components/deposit/add/SymDeposit.tsx index 1a5021c4e..b1e70d157 100644 --- a/src/renderer/components/deposit/add/SymDeposit.tsx +++ b/src/renderer/components/deposit/add/SymDeposit.tsx @@ -1300,6 +1300,32 @@ export const SymDeposit: React.FC = (props) => { ) }, [asset, network, symAssetMismatchRD]) + const resetEnteredAmounts = useCallback(() => { + setRuneAmountToDeposit(baseAmount(0, THORCHAIN_DECIMAL)) + setAssetAmountToDepositMax1e8(initialAssetAmountToDepositMax1e8) + setPercentValueToDeposit(0) + }, [initialAssetAmountToDepositMax1e8, setAssetAmountToDepositMax1e8]) + + const onChangeRuneWalletType = useCallback( + (walletType) => { + setRuneLedger(() => isLedgerWallet(walletType)) + setRuneWalletType(walletType) + resetEnteredAmounts() + }, + + [resetEnteredAmounts, setRuneWalletType] + ) + + const onChangeAssetWalletType = useCallback( + (walletType) => { + setUseAssetLedger(() => isLedgerWallet(walletType)) + setAssetWalletType(walletType) + + resetEnteredAmounts() + }, + [resetEnteredAmounts, setAssetWalletType] + ) + const prevRouterAddress = useRef>(O.none) // Run `checkApprovedStatus` whenever `oPoolAddress` has been changed @@ -1437,10 +1463,7 @@ export const SymDeposit: React.FC = (props) => { walletTypeTooltipColor={assetWalletTypeTooltip.color} // Disable ledger selection if RUNE Ledger has been selected walletTypeDisabled={!hasAssetLedger || useRuneLedger} - onChangeWalletType={(walletType) => { - setUseAssetLedger(() => isLedgerWallet(walletType)) - setAssetWalletType(walletType) - }} + onChangeWalletType={onChangeAssetWalletType} assetBalance={assetBalance} disabled={disabledForm} asset={{ @@ -1481,10 +1504,7 @@ export const SymDeposit: React.FC = (props) => { walletTypeTooltipColor={runeWalletTypeTooltip.color} // Disable ledger checkbox if asset ledger is used walletTypeDisabled={!hasRuneLedger || useAssetLedger} - onChangeWalletType={(walletType) => { - setRuneLedger(() => isLedgerWallet(walletType)) - setRuneWalletType(walletType) - }} + onChangeWalletType={onChangeRuneWalletType} assetBalance={runeBalance} disabled={disabledForm} asset={{ From 648ea8266ec9def7cf4872577de3a0964cdff48e Mon Sep 17 00:00:00 2001 From: Veado Date: Mon, 29 Nov 2021 17:12:16 +0100 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f702738ba..3064ab8d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,13 @@ ## Add -- [Ledger] Add liquidity using Ledger [#1926](https://github.com/thorchain/asgardex-electron/pull/1926), [#1927](https://github.com/thorchain/asgardex-electron/issues/1927) [#1936](https://github.com/thorchain/asgardex-electron/issues/1936) +- [Ledger] Add liquidity using Ledger [#1926](https://github.com/thorchain/asgardex-electron/pull/1926), [#1927](https://github.com/thorchain/asgardex-electron/issues/1927) [#1936](https://github.com/thorchain/asgardex-electron/issues/1936), [#1962](https://github.com/thorchain/asgardex-electron/pull/1962) - [ADD] Update shares for Ledger [#1942](https://github.com/thorchain/asgardex-electron/pull/1942) - Restore previous windows dimensions with next start of ASGDX [#1879](https://github.com/thorchain/asgardex-electron/issues/1879) - Show asset icon in TxDetail (wallet history + pool details)[#1955](https://github.com/thorchain/asgardex-electron/pull/1955) - [ADD] Check asset mismatch for Ledger + keystore [#1938](https://github.com/thorchain/asgardex-electron/issues/1938) - Show ledger | keystore addresses in tooltips [#1959](https://github.com/thorchain/asgardex-electron/pull/1959) +- Whitelist TGT token [#1960](https://github.com/thorchain/asgardex-electron/issues/1960) ## Update