Merge pull request #3293 from Emurgo/fix/YOEXT-790/restore-already-re…

…stored-wallet-flow fix(wallet): restore already restored wallet flow
Emurgo · Oct 4, 2023 · efc2c22 · efc2c22
2 parents 8be0d22 + 89bdf67
commit efc2c22
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/packages/yoroi-extension/app/components/wallet/create-wallet/StepController.js b/packages/yoroi-extension/app/components/wallet/create-wallet/StepController.js
@@ -24,17 +24,18 @@ function StepController(props: Props): Node {
       py="24px"
       gap="24px"
     >
-      {actions.map(({ type, label, disabled, onClick }) => {
+      {actions.map(({ type, label, disabled, onClick }, idx) => {
         const isPrimary = type === 'primary';
         return (
           <Button
+            key={idx}
             variant={isPrimary ? 'contained' : 'outlined'}
             color="primary"
             disableRipple={false}
             onClick={onClick}
             disabled={disabled}
             style={{ width: '144px', height: '48px' }}
-            id={type+'Button'}
+            id={type + 'Button'}
           >
             {label}
           </Button>

diff --git a/...s/yoroi-extension/app/components/wallet/restore/steps/phrase/RestoreRecoveryPhraseForm.js b/...s/yoroi-extension/app/components/wallet/restore/steps/phrase/RestoreRecoveryPhraseForm.js
@@ -164,7 +164,6 @@ export default class RestoreRecoveryPhraseFormClass extends Component<Props, Sta
 
             return (
               <Stack
-                item
                 // use the form name key to know when we reset
                 key={form.name + '-word-' + idx}
               >

diff --git a/packages/yoroi-extension/app/containers/wallet/restore/RestoreWalletPage.js b/packages/yoroi-extension/app/containers/wallet/restore/RestoreWalletPage.js
@@ -19,11 +19,12 @@ import { observer } from 'mobx-react';
 import { computed } from 'mobx';
 import { SelectedExplorer } from '../../../domain/SelectedExplorer';
 import { PublicDeriver } from '../../../api/ada/lib/storage/models/PublicDeriver';
+import { ROUTES } from '../../../routes-config';
+import { MultiToken } from '../../../api/common/lib/MultiToken';
 import TopBarLayout from '../../../components/layout/TopBarLayout';
 import BannerContainer from '../../banners/BannerContainer';
 import SidebarContainer from '../../SidebarContainer';
 import LocalizableError from '../../../i18n/LocalizableError';
-import { ROUTES } from '../../../routes-config';
 
 export const RestoreWalletPagePromise: void => Promise<any> = () =>
   import('../../../components/wallet/restore/RestoreWalletPage');
@@ -111,6 +112,9 @@ export default class RestoreWalletPage extends Component<Props> {
       walletSettings: {|
         getConceptualWalletSettingsCache: ConceptualWallet => ConceptualWalletSettingsCache,
       |},
+      transactions: {|
+        getBalance: (PublicDeriver<>) => MultiToken | null,
+      |},
     |},
   |} {
     if (this.props.generated !== undefined) {
@@ -149,6 +153,9 @@ export default class RestoreWalletPage extends Component<Props> {
           selectedAccount: stores.walletRestore.selectedAccount,
           mode: stores.walletRestore.mode,
         },
+        transactions: {
+          getBalance: stores.transactions.getBalance,
+        },
       },
       actions: {
         dialogs: {