Merge branch 'stardust-develop' into release/desktop-2.0.0-beta-7

iotaledger · Sep 21, 2022 · 925f22c · 925f22c
2 parents 306873b + fa19dc5
commit 925f22c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json
@@ -959,6 +959,8 @@
         "chooseFile": "Choose a File",
         "dropHere": "Drop your file here",
         "syncAll": "Sync all",
+        "import": "Import",
+        "importing": "Importing",
         "export": "Export",
         "exporting": "Exporting",
         "exportNewStronghold": "Export a new Stronghold",

diff --git a/packages/shared/routes/onboarding/views/profile-recovery/views/BackupPasswordView.svelte b/packages/shared/routes/onboarding/views/profile-recovery/views/BackupPasswordView.svelte
@@ -25,6 +25,7 @@
 
     async function onContinueClick(): Promise<void> {
         if (strongholdPassword) {
+            busy = true
             try {
                 if ($onboardingProfile?.setupType === ProfileSetupType.Claimed) {
                     await restoreBackupForShimmerClaimingProfileManager(strongholdPassword)
@@ -53,6 +54,7 @@
                     })
                 }
             }
+            busy = false
         }
     }
 
@@ -98,7 +100,13 @@
         />
     </div>
     <div slot="leftpane__action" class="flex flex-row flex-wrap justify-between items-center space-x-4">
-        <Button classes="flex-1" disabled={strongholdPassword.length === 0 || busy} onClick={onContinueClick}>
+        <Button
+            classes="flex-1"
+            disabled={strongholdPassword.length === 0 || busy}
+            isBusy={busy}
+            busyMessage={`${localize('actions.importing')}...`}
+            onClick={onContinueClick}
+        >
             {localize('actions.continue')}
         </Button>
     </div>

diff --git a/...ared/routes/onboarding/views/storage-protection-setup/views/SetupPinProtectionView.svelte b/...ared/routes/onboarding/views/storage-protection-setup/views/SetupPinProtectionView.svelte
@@ -61,6 +61,8 @@
     }
 
     async function handleSetPin(): Promise<void> {
+        busy = true
+
         await initialisePincodeManager(setPinInput)
 
         const canInitialiseFirstShimmerClaimingAccount =
@@ -71,6 +73,8 @@
             await initialiseFirstShimmerClaimingAccount()
         }
 
+        busy = false
+
         $storageProtectionSetupRouter.next()
     }
 
@@ -133,6 +137,8 @@
             type={HTMLButtonType.Submit}
             disabled={!(arePinInputsValid && arePinInputsMatching) || busy}
             form="setup-pin"
+            isBusy={busy}
+            busyMessage={`${localize('actions.initializing')}...`}
             bind:this={submitButtonElement}
         >
             {localize('actions.continue')}