Merge branch 'canary' into fix/reactivity-issue-after-user-gets-enoug…

…h-mana
iotaledger · May 17, 2024 · cb15944 · cb15944
2 parents 2be6e0b + 5104d5e
commit cb15944
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/packages/desktop/components/ManaBox.svelte b/packages/desktop/components/ManaBox.svelte
@@ -75,6 +75,11 @@
                 estimatedManaCost = undefined
                 errorMessage = localize('general.insufficientManaGeneration')
             }
+            if (transactionInfo.preparedTransactionError.message?.includes('cannot be moved off block issuer')) {
+                manaToGenerate = undefined
+                estimatedManaCost = undefined
+                errorMessage = localize('general.cannotMoveManaOffBlockIssuer')
+            }
         } else if (transactionInfo?.preparedTransaction) {
             errorMessage = ''
             manaToGenerate = undefined

diff --git a/packages/desktop/components/WalletSummary.svelte b/packages/desktop/components/WalletSummary.svelte
@@ -9,9 +9,11 @@
     import { activeProfile } from '@core/profile'
 
     $: fomattedNetworkName = $nodeInfoNetworkName
-        .split(' ')
-        .map((word) => word[0].toUpperCase() + word.substring(1))
-        .join(' ')
+        ? $nodeInfoNetworkName
+              .split(' ')
+              .map((word) => word[0].toUpperCase() + word.substring(1))
+              .join(' ')
+        : ''
 
     $: ({ baseCoin, mana } = $selectedWalletAssets[$activeProfile?.network.id])
 </script>

diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json
@@ -1769,6 +1769,7 @@
         "availableMana": "Available Mana",
         "insufficientMana": "Generating Mana... Deficit: {mana}. Waiting time: {time}.",
         "insufficientManaGeneration": "Your funds do not generate enough mana. Send funds to your wallet for faster mana generation.",
+        "cannotMoveManaOffBlockIssuer": "Mana can only be moved from block issuer accounts using manalocks.",
         "secondsToRefreshManaCost": "Mana cost will be refreshed after {time, plural, one {# second} other {# seconds}}",
         "mana": "Mana",
         "delegationCreated": "Delegation created",