Make ImportAccountsSelectionModal compatible with React 18 Strict Mode

oasisprotocol · Oct 3, 2022 · 22380a7 · 22380a7
1 parent 10d9868
commit 22380a7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/app/pages/OpenWalletPage/Features/ImportAccountsSelectionModal/index.tsx b/src/app/pages/OpenWalletPage/Features/ImportAccountsSelectionModal/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { useDispatch, useSelector } from 'react-redux'
 import { AlertBox } from 'app/components/AlertBox'
@@ -61,13 +61,6 @@ export function ImportAccountsSelectionModal(props: ImportAccountsSelectionModal
         : walletActions.openWalletFromMnemonic(),
     )
   }
-
-  useEffect(() => {
-    return () => {
-      dispatch(importAccountsActions.clear())
-    }
-  }, [dispatch])
-
   const cancelDisabled = importAccounts.step === ImportAccountsStep.Done || error ? false : true
   const confirmDisabled = importAccounts.step !== ImportAccountsStep.Done || selectedAccounts.length === 0
 

diff --git a/src/app/state/wallet/saga.test.ts b/src/app/state/wallet/saga.test.ts
@@ -7,6 +7,7 @@ import { walletActions } from '.'
 import { transactionActions } from '../transaction'
 import { getBalance, rootWalletSaga, walletSaga } from './saga'
 import { AddWalletPayload, WalletType } from './types'
+import { importAccountsActions } from '../importaccounts'
 
 describe('Wallet Sagas', () => {
   const validPrivateKeyHex =
@@ -47,6 +48,7 @@ describe('Wallet Sagas', () => {
         .withState(state)
         .dispatch(walletActions.openWalletFromMnemonic())
         .fork(walletSaga)
+        .put(importAccountsActions.clear())
         .put(
           walletActions.addWallet({
             address: 'oasis1qq2vzcvxn0js5unsch5me2xz4kr43vcasv0d5eq4',
@@ -91,6 +93,7 @@ describe('Wallet Sagas', () => {
         .withState(state)
         .dispatch(walletActions.openWalletsFromLedger())
         .fork(walletSaga)
+        .put(importAccountsActions.clear())
         .put.actionType(walletActions.selectWallet.type)
         .silentRun(50)
     })

diff --git a/src/app/state/wallet/saga.ts b/src/app/state/wallet/saga.ts
@@ -5,6 +5,7 @@ import { call, delay, fork, put, select, take, takeEvery } from 'typed-redux-sag
 import { selectSelectedAccounts } from 'app/state/importaccounts/selectors'
 
 import { walletActions } from '.'
+import { importAccountsActions } from '../importaccounts'
 import { ImportAccountsListAccount } from '../importaccounts/types'
 import { getOasisNic } from '../network/saga'
 import { transactionActions } from '../transaction'
@@ -57,6 +58,7 @@ function* getWalletByAddress(address: string) {
  */
 export function* openWalletsFromLedger() {
   const accounts: ImportAccountsListAccount[] = yield* select(selectSelectedAccounts)
+  yield* put(importAccountsActions.clear())
   for (const account of accounts) {
     yield* put(
       walletActions.addWallet({
@@ -92,6 +94,7 @@ export function* openWalletFromPrivateKey({ payload: privateKey }: PayloadAction
 
 export function* openWalletFromMnemonic() {
   const accounts: ImportAccountsListAccount[] = yield* select(selectSelectedAccounts)
+  yield* put(importAccountsActions.clear())
   for (const account of accounts) {
     yield* put(
       walletActions.addWallet({