Merge branch 'develop' into feat/update-deeplinks-doc

Author: evavirseda

Diff for: packages/desktop/components/popups/send/SendConfirmationPopup.svelte

@@ -59,6 +59,8 @@
     let minimumStorageDeposit = 0
     let visibleSurplus: number | undefined = undefined
 
+    let isPreparingOutput = false
+
     $: expirationTimePicker?.setNull(giftStorageDeposit)
 
     $: isBaseTokenTransfer =
@@ -101,6 +103,8 @@
     })
 
     async function rebuildTransactionOutput(): Promise<void> {
+        isPreparingOutput = true
+
         updateNewTransactionDetails({
             type: transactionType,
             expirationDate,
@@ -126,6 +130,8 @@
             }
         } catch (err) {
             handleError(err)
+        } finally {
+            isPreparingOutput = false
         }
     }
 
@@ -261,9 +267,12 @@
             classes="w-full"
             onClick={onConfirmClick}
             disabled={isTransferring ||
+                isPreparingOutput ||
                 (layer2Parameters?.networkAddress && !$newTransactionDetails?.layer2Parameters?.gasBudget)}
             isBusy={isTransferring ||
+                isPreparingOutput ||
                 (layer2Parameters?.networkAddress && !$newTransactionDetails?.layer2Parameters?.gasBudget)}
+            busyMessage={isPreparingOutput ? 'Preparing' : ''}
         >
             {localize('actions.send')}
         </Button>

Diff for: packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
     "name": "desktop",
     "productName": "Firefly Shimmer",
-    "version": "2.1.9",
+    "version": "2.1.10",
     "description": "Official wallet application of Shimmer",
     "main": "public/build/main.js",
     "repository": "[email protected]:iotaledger/firefly.git",

Diff for: packages/desktop/views/dashboard/vesting/Vesting.svelte

@@ -41,12 +41,10 @@
     let modal: Modal
     let timeUntilNextPayout = DEFAULT_EMPTY_VALUE_STRING
     let minRequiredStorageDeposit: number | null
-    let hasOutputsToConsolidate = false
 
     $: ({ baseCoin } = $selectedAccountAssets[$activeProfile?.network?.id])
     $: hasTransactionInProgress =
         $selectedAccount?.isTransferring || $selectedAccount.hasConsolidatingOutputsTransactionInProgress
-    $: $selectedAccount, areOutputsReadyForConsolidation()
     $: vestingOverview = [
         {
             title: localize('views.vesting.overview.unlocked'),
@@ -71,20 +69,12 @@
         $selectedAccountVestingUnclaimedFunds > 0 &&
         !hasTransactionInProgress &&
         minRequiredStorageDeposit !== null &&
-        $selectedAccount?.balances?.baseCoin?.available > minRequiredStorageDeposit &&
-        hasOutputsToConsolidate
+        $selectedAccount?.balances?.baseCoin?.available > minRequiredStorageDeposit
 
     onMount(() => {
         getMinRequiredStorageDeposit()
     })
 
-    function areOutputsReadyForConsolidation(): void {
-        $selectedAccount
-            .prepareConsolidateOutputs({ force: false, outputThreshold: 2 })
-            .then(() => (hasOutputsToConsolidate = true))
-            .catch(() => (hasOutputsToConsolidate = false))
-    }
-
     function getMinRequiredStorageDeposit() {
         getRequiredStorageDepositForMinimalBasicOutput()
             .then((deposit) => (minRequiredStorageDeposit = deposit))

Diff for: packages/shared/locales/ar.json

@@ -539,8 +539,8 @@
                 }
             },
             "banners": {
-                "new": "New Event",
-                "complete": "Complete"
+                "new": "حدث جديد",
+                "complete": "مكتمل"
             }
         },
         "picker": {

Diff for: packages/shared/locales/da.json

@@ -1966,7 +1966,7 @@
         },
         "layer2": {
             "layer1Recipient": "A layer 2 transaction cannot be sent to a layer 1 account.",
-            "estimatedGas": "Failed to estimate gas."
+            "estimatedGas": "Kunne ikke estimere gas."
         },
         "node": {
             "invalid": "Indtast venligst en gyldig URL.",

Diff for: packages/shared/locales/de.json

@@ -1966,7 +1966,7 @@
         },
         "layer2": {
             "layer1Recipient": "Eine Layer-2-Transaktion kann nicht an ein Layer-1-Konto gesendet werden.",
-            "estimatedGas": "Failed to estimate gas."
+            "estimatedGas": "Gas konnte nicht geschätzt werden."
         },
         "node": {
             "invalid": "Gib eine gültige URL ein.",

Diff for: packages/shared/locales/es-ES.json

@@ -1966,7 +1966,7 @@
         },
         "layer2": {
             "layer1Recipient": "Una transacción de capa 2 no puede ser enviada a una cuenta de capa 1.",
-            "estimatedGas": "Failed to estimate gas."
+            "estimatedGas": "Error al estimar el gas."
         },
         "node": {
             "invalid": "Por favor, introduce una URL válida.",

Diff for: packages/shared/locales/es-LA.json

@@ -1966,7 +1966,7 @@
         },
         "layer2": {
             "layer1Recipient": "A layer 2 transaction cannot be sent to a layer 1 account.",
-            "estimatedGas": "Failed to estimate gas."
+            "estimatedGas": "Falló al estimarse el gas."
         },
         "node": {
             "invalid": "Por favor, introduzca una URL válida.",

Diff for: packages/shared/locales/hu.json

@@ -1966,7 +1966,7 @@
         },
         "layer2": {
             "layer1Recipient": "A 2. rétegbeli tranzakció nem küldhető át egy 1. rétegbeli számlára.",
-            "estimatedGas": "Failed to estimate gas."
+            "estimatedGas": "Tranzakciós költség (gáz) becslése sikertelen."
         },
         "node": {
             "invalid": "Kérjük, adjon meg egy érvényes URL címet!",