enhancment: fix and polish sidebar toasts (#2215)

* enhancment: fix and polish sidebar toasts * fix: check for prod not alpha * chore: replace Early Access with Production * fix: pr review comments * Update packages/shared/src/locales/en.json Co-authored-by: Mark Nardi <[email protected]> --------- Co-authored-by: Mark Nardi <[email protected]>
bloomwalletio · Apr 2, 2024 · ae51be8 · ae51be8
1 parent 08870a9
commit ae51be8
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 47 deletions.
diff --git a/packages/desktop/views/dashboard/components/DashboardSidebar.svelte b/packages/desktop/views/dashboard/components/DashboardSidebar.svelte
@@ -2,19 +2,26 @@
     import { LogoName } from '@auxiliary/logo'
     import { IconButton, IconName } from '@bloomwalletio/ui'
     import { ProfileActionsMenu, SidebarTab } from '@components'
+    import { APP_STAGE, AppStage } from '@core/app'
     import { localize } from '@core/i18n'
+    import { StardustNetworkId } from '@core/network'
     import { activeProfile, isSoftwareProfile } from '@core/profile/stores'
-    import { DashboardRoute, collectiblesRouter, dashboardRouter, governanceRouter, settingsRouter } from '@core/router'
+    import {
+        DashboardRoute,
+        collectiblesRouter,
+        dashboardRoute,
+        dashboardRouter,
+        governanceRouter,
+        settingsRouter,
+    } from '@core/router'
+    import { isDashboardSideBarExpanded } from '@core/ui'
     import { IDashboardSidebarTab } from '@desktop/routers'
     import features from '@features/features'
     import { Logo } from '@ui'
+    import { campaignsRouter } from '../campaigns'
     import LedgerStatusTile from './LedgerStatusTile.svelte'
     import StrongholdStatusTile from './StrongholdStatusTile.svelte'
-    import { AutoUpdateToast, BackupToast, VersionToast } from './toasts'
-    import { dashboardRoute } from '@core/router'
-    import { StardustNetworkId } from '@core/network'
-    import { isDashboardSideBarExpanded } from '@core/ui'
-    import { campaignsRouter } from '../campaigns'
+    import { BackupToast, VersionToast } from './toasts'
 
     let expanded = true
     function toggleExpand(): void {
@@ -160,12 +167,11 @@
 
         {#if expanded}
             <dashboard-sidebar-tiles class="w-full flex flex-col space-y-2">
-                {#if false}
-                    <!-- TODO: logic of when to display toast one at a time -->
-                    <AutoUpdateToast />
+                {#if APP_STAGE === AppStage.PROD}
                     <BackupToast />
+                {:else}
+                    <VersionToast />
                 {/if}
-                <VersionToast />
                 {#if $isSoftwareProfile}
                     <StrongholdStatusTile />
                 {:else}

diff --git a/packages/desktop/views/dashboard/components/toasts/BackupToast.svelte b/packages/desktop/views/dashboard/components/toasts/BackupToast.svelte
@@ -18,13 +18,15 @@
     }
 </script>
 
-<SidebarToast
-    color="yellow"
-    header={localize(`${localeKey}.header`)}
-    body={localize(`${localeKey}.body`)}
-    button={{
-        text: localize(`${localeKey}.button`),
-        onClick,
-    }}
-    open={$isSoftwareProfile && requiresBackup}
-/>
+{#if requiresBackup}
+    <SidebarToast
+        color="yellow"
+        header={localize(`${localeKey}.header`)}
+        body={localize(`${localeKey}.body`)}
+        button={{
+            text: localize(`${localeKey}.button`),
+            onClick,
+        }}
+        open={$isSoftwareProfile && requiresBackup}
+    />
+{/if}
diff --git a/packages/desktop/views/dashboard/components/toasts/VersionToast.svelte b/packages/desktop/views/dashboard/components/toasts/VersionToast.svelte
@@ -1,26 +1,19 @@
 <script lang="ts">
     import { Color, SidebarToast } from '@bloomwalletio/ui'
-    import { APP_STAGE, AppStage, openUrlInBrowser } from '@core/app'
+    import { APP_STAGE, AppStage } from '@core/app'
     import { localize } from '@core/i18n'
 
     const TOAST_PROPS: { [key in AppStage]: Color } = {
         [AppStage.ALPHA]: 'cyan',
         [AppStage.BETA]: 'sky',
         [AppStage.PROD]: 'blue',
     }
-
-    const localeKey = 'views.dashboard.toasts.version'
-
-    function onClick(): void {
-        openUrlInBrowser('https://medium.com/bloom-wallet/unveiling-bloom-early-access-8038d29c5f86')
-    }
 </script>
 
 <SidebarToast
     color={TOAST_PROPS[APP_STAGE]}
     header={localize(`popups.appUpdate.${APP_STAGE}`)}
-    body={localize(`${localeKey}.body`)}
+    body={localize('views.dashboard.toasts.version.body')}
     open
     dismissable={false}
-    button={APP_STAGE === AppStage.PROD ? { text: localize(`${localeKey}.button`), onClick } : undefined}
 />
diff --git a/packages/shared/src/lib/contexts/onboarding/actions/backupInitialStronghold.ts b/packages/shared/src/lib/contexts/onboarding/actions/backupInitialStronghold.ts
@@ -11,8 +11,11 @@ import { onboardingProfile, updateOnboardingProfile } from '../stores'
  * Creates an initial backup for a profile's Stronghold.
  */
 export async function backupInitialStronghold(): Promise<void> {
-    const strongholdBackupDestination = await Platform.getStrongholdBackupDestination(getDefaultStrongholdName())
-    const password = get(onboardingProfile)?.strongholdPassword
+    const $onboardingProfile = get(onboardingProfile)
+    const strongholdBackupDestination = await Platform.getStrongholdBackupDestination(
+        getDefaultStrongholdName($onboardingProfile?.name)
+    )
+    const password = $onboardingProfile?.strongholdPassword
     if (strongholdBackupDestination && password) {
         await backup(strongholdBackupDestination, password)
         updateOnboardingProfile({ lastStrongholdBackupTime: new Date() })

diff --git a/packages/shared/src/lib/contexts/settings/actions/exportStronghold.ts b/packages/shared/src/lib/contexts/settings/actions/exportStronghold.ts
@@ -1,15 +1,16 @@
 import { Platform } from '@core/app/classes'
 import { IError } from '@core/error/interfaces'
 import { backup } from '@core/profile-manager'
-import { updateActiveProfile } from '@core/profile/stores'
+import { getActiveProfile, updateActiveProfile } from '@core/profile/stores'
 import { getDefaultStrongholdName } from '@core/stronghold'
 
 export async function exportStronghold(
     password: string,
     callback?: (cancelled: boolean, error?: string) => void
 ): Promise<void> {
     try {
-        const destination = await Platform.getStrongholdBackupDestination(getDefaultStrongholdName())
+        const activeProfile = getActiveProfile()
+        const destination = await Platform.getStrongholdBackupDestination(getDefaultStrongholdName(activeProfile?.name))
         if (destination) {
             await backup(destination, password)
             updateActiveProfile({ lastStrongholdBackupTime: new Date() })

diff --git a/packages/shared/src/lib/core/stronghold/utils/getDefaultStrongholdName.ts b/packages/shared/src/lib/core/stronghold/utils/getDefaultStrongholdName.ts
@@ -1,6 +1,6 @@
 import { getTimestampForFilenames } from '@core/utils'
 
-export function getDefaultStrongholdName(): string {
+export function getDefaultStrongholdName(profileName: string | undefined): string {
     const timestamp = getTimestampForFilenames()
-    return `bloom-backup-${timestamp}.stronghold`
+    return `bloom-backup-${profileName?.replaceAll(' ', '')}-${timestamp}.stronghold`
 }
diff --git a/packages/shared/src/locales/de.json b/packages/shared/src/locales/de.json
@@ -821,7 +821,7 @@
             "installedVersion": "Installierte Version",
             "newVersion": "Neue Version",
             "stage": "Phase",
-            "prod": "Early Access",
+            "prod": "Production",
             "alpha": "Alpha",
             "beta": "Beta",
             "releasedAt": "Veröffentlicht am",

diff --git a/packages/shared/src/locales/en.json b/packages/shared/src/locales/en.json
@@ -600,12 +600,11 @@
             "toasts": {
                 "backup": {
                     "header": "Backup Required",
-                    "body": "You have not backed up your profile yet! We highly recommend backing this up in case you lose access to this device.",
+                    "body": "You haven't backed up your profile in while.",
                     "button": "Backup now"
                 },
                 "version": {
-                    "body": "You are currently using an early version of Bloom.",
-                    "button": "Find out more"
+                    "body": "You are currently using a development version of Bloom."
                 },
                 "update": {
                     "header": "Update Required",
@@ -848,7 +847,7 @@
             "installedVersion": "Installed version",
             "newVersion": "New version",
             "stage": "Stage",
-            "prod": "Early Access",
+            "prod": "Production",
             "alpha": "Alpha",
             "beta": "Beta",
             "releasedAt": "Released at",

diff --git a/packages/shared/src/locales/es-ES.json b/packages/shared/src/locales/es-ES.json
@@ -821,7 +821,7 @@
             "installedVersion": "Installed version",
             "newVersion": "New version",
             "stage": "Stage",
-            "prod": "Early Access",
+            "prod": "Production",
             "alpha": "Alpha",
             "beta": "Beta",
             "releasedAt": "Released at",

diff --git a/packages/shared/src/locales/fr.json b/packages/shared/src/locales/fr.json
@@ -821,7 +821,7 @@
             "installedVersion": "Version installée",
             "newVersion": "New version",
             "stage": "Étape",
-            "prod": "Early Access",
+            "prod": "Production",
             "alpha": "Alpha",
             "beta": "Bêta",
             "releasedAt": "Publié le",

diff --git a/packages/shared/src/locales/hi.json b/packages/shared/src/locales/hi.json
@@ -670,7 +670,7 @@
             "installedVersion": "Installed version",
             "newVersion": "New version",
             "stage": "Stage",
-            "prod": "Early Access",
+            "prod": "Production",
             "alpha": "Alpha",
             "beta": "Beta",
             "releasedAt": "Released at",

diff --git a/packages/shared/src/locales/nl.json b/packages/shared/src/locales/nl.json
@@ -821,7 +821,7 @@
             "installedVersion": "Geïnstalleerde versie",
             "newVersion": "Nieuwe versie",
             "stage": "Stage",
-            "prod": "Early Access",
+            "prod": "Production",
             "alpha": "Alpha",
             "beta": "Beta",
             "releasedAt": "Uitgebracht op",

diff --git a/packages/shared/src/locales/pt-BR.json b/packages/shared/src/locales/pt-BR.json
@@ -821,7 +821,7 @@
             "installedVersion": "Versão instalada",
             "newVersion": "Nova versão",
             "stage": "Stage",
-            "prod": "Early Access",
+            "prod": "Production",
             "alpha": "Alpha",
             "beta": "Beta",
             "releasedAt": "Released at",

diff --git a/packages/shared/src/locales/sv.json b/packages/shared/src/locales/sv.json
@@ -733,7 +733,7 @@
             "installedVersion": "Installed version",
             "newVersion": "New version",
             "stage": "Stage",
-            "prod": "Early Access",
+            "prod": "Production",
             "alpha": "Alpha",
             "beta": "Beta",
             "releasedAt": "Released at",

diff --git a/packages/shared/src/locales/zh-CN.json b/packages/shared/src/locales/zh-CN.json
@@ -821,7 +821,7 @@
             "installedVersion": "Installed version",
             "newVersion": "New version",
             "stage": "Stage",
-            "prod": "Early Access",
+            "prod": "Production",
             "alpha": "Alpha",
             "beta": "Beta",
             "releasedAt": "Released at",