Skip to content

Commit e200015

Browse files
Merge pull request #7738 from iotaledger/release/desktop-shimmer-2.1.10
release: desktop shimmer 2.1.10
2 parents 6e0907c + c324b5c commit e200015

File tree

4 files changed

+37
-16
lines changed

4 files changed

+37
-16
lines changed

packages/desktop/components/popups/send/SendConfirmationPopup.svelte

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
let minimumStorageDeposit = 0
6060
let visibleSurplus: number | undefined = undefined
6161
62+
let isPreparingOutput = false
63+
6264
$: expirationTimePicker?.setNull(giftStorageDeposit)
6365
6466
$: isBaseTokenTransfer =
@@ -101,6 +103,8 @@
101103
})
102104
103105
async function rebuildTransactionOutput(): Promise<void> {
106+
isPreparingOutput = true
107+
104108
updateNewTransactionDetails({
105109
type: transactionType,
106110
expirationDate,
@@ -126,6 +130,8 @@
126130
}
127131
} catch (err) {
128132
handleError(err)
133+
} finally {
134+
isPreparingOutput = false
129135
}
130136
}
131137
@@ -261,9 +267,12 @@
261267
classes="w-full"
262268
onClick={onConfirmClick}
263269
disabled={isTransferring ||
270+
isPreparingOutput ||
264271
(layer2Parameters?.networkAddress && !$newTransactionDetails?.layer2Parameters?.gasBudget)}
265272
isBusy={isTransferring ||
273+
isPreparingOutput ||
266274
(layer2Parameters?.networkAddress && !$newTransactionDetails?.layer2Parameters?.gasBudget)}
275+
busyMessage={isPreparingOutput ? 'Preparing' : ''}
267276
>
268277
{localize('actions.send')}
269278
</Button>

packages/desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "desktop",
33
"productName": "Firefly Shimmer",
4-
"version": "2.1.9",
4+
"version": "2.1.10",
55
"description": "Official wallet application of Shimmer",
66
"main": "public/build/main.js",
77
"repository": "[email protected]:iotaledger/firefly.git",

packages/shared/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"@iota/bundle": "^1.0.0-beta.30",
88
"@iota/converter": "^1.0.0-beta.30",
99
"@iota/crypto.js": "^1.8.6",
10+
"@iota/sdk": "1.1.4",
1011
"@iota/transaction": "^1.0.0-beta.30",
1112
"@iota/transaction-converter": "^1.0.0-beta.30",
1213
"@iota/unit-converter": "^1.0.0-beta.30",
1314
"@iota/util.js": "^2.0.0-rc.1",
14-
"@iota/sdk": "1.1.3",
1515
"@sveltejs/svelte-virtual-list": "^3.0.1",
1616
"big-integer": "^1.6.51",
1717
"big.js": "^6.0.3",

yarn.lock

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -767,10 +767,10 @@
767767
resolved "https://registry.yarnpkg.com/@iota/pad/-/pad-1.0.0-beta.30.tgz#de19728f8f1b09c20e2365d0da34945006760082"
768768
integrity sha512-fnhPMPul18WunLq9Ni4rxzBFmhna6eaG8WroDg6GdQqSK/eN62uFHV8tpspJHXuCqwgCUVp6NpuUna7+B2OV9g==
769769

770-
771-
version "1.1.3"
772-
resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.1.3.tgz#ab54cf72d9fa46321ae635cdd7fb2e085e888d95"
773-
integrity sha512-Igy1Pl4mLPIGJddepcJ0i3xF/6Yup8pMl0eSTknN1A97qhsNtvmV1iDDhSxAshmJYyBQ8LEzd0DrMrq5tioYyg==
770+
771+
version "1.1.4"
772+
resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.1.4.tgz#0661c6132c7632afcf7bf211e30d3e1b7bdddbb8"
773+
integrity sha512-crcFQZzhsApDr44qBUTaIncGeArXjhuuY8+sjtOvNKz96S322MBmYiFVcyEOjtyeddBdo3J7YVWHx5eInYOmvw==
774774
dependencies:
775775
"@types/node" "^18.15.12"
776776
cargo-cp-artifact "^0.1.6"
@@ -1712,11 +1712,18 @@
17121712
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.38.tgz#1dcdb6c54d02b323f621213745f2e44af30c73e6"
17131713
integrity sha512-6sfo1qTulpVbkxECP+AVrHV9OoJqhzCsfTNp5NIG+enM4HyM3HvZCO798WShIXBN0+QtDIcutJCjsVYnQP5rIQ==
17141714

1715-
"@types/node@^18.15.11", "@types/node@^18.15.12":
1715+
"@types/node@^18.15.11":
17161716
version "18.16.19"
17171717
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.19.tgz#cb03fca8910fdeb7595b755126a8a78144714eea"
17181718
integrity sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==
17191719

1720+
"@types/node@^18.15.12":
1721+
version "18.19.3"
1722+
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.3.tgz#e4723c4cb385641d61b983f6fe0b716abd5f8fc0"
1723+
integrity sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==
1724+
dependencies:
1725+
undici-types "~5.26.4"
1726+
17201727
"@types/plist@^3.0.1":
17211728
version "3.0.2"
17221729
resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01"
@@ -6256,9 +6263,9 @@ mz@^2.7.0:
62566263
thenify-all "^1.0.0"
62576264

62586265
nanoid@^3.1.31, nanoid@^3.3.6:
6259-
version "3.3.6"
6260-
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
6261-
integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
6266+
version "3.3.7"
6267+
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
6268+
integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
62626269

62636270
napi-build-utils@^1.0.1:
62646271
version "1.0.2"
@@ -6296,9 +6303,9 @@ nice-try@^1.0.4:
62966303
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
62976304

62986305
node-abi@^3.0.0, node-abi@^3.3.0, node-abi@^3.8.0:
6299-
version "3.51.0"
6300-
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
6301-
integrity sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==
6306+
version "3.52.0"
6307+
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.52.0.tgz#ffba0a85f54e552547e5849015f40f9514d5ba7c"
6308+
integrity sha512-JJ98b02z16ILv7859irtXn4oUaFWADtvkzy2c0IAatNVX2Mc9Yoh8z6hZInn3QwvMEYhHuQloYi+TTQy67SIdQ==
63026309
dependencies:
63036310
semver "^7.3.5"
63046311

@@ -7149,9 +7156,9 @@ rechoir@^0.8.0:
71497156
resolve "^1.20.0"
71507157

71517158
reflect-metadata@^0.1.13:
7152-
version "0.1.13"
7153-
resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
7154-
integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
7159+
version "0.1.14"
7160+
resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.14.tgz#24cf721fe60677146bb77eeb0e1f9dece3d65859"
7161+
integrity sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==
71557162

71567163
regexp-tree@~0.1.1:
71577164
version "0.1.27"
@@ -8442,6 +8449,11 @@ unbox-primitive@^1.0.2:
84428449
has-symbols "^1.0.3"
84438450
which-boxed-primitive "^1.0.2"
84448451

8452+
undici-types@~5.26.4:
8453+
version "5.26.5"
8454+
resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
8455+
integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
8456+
84458457
unique-filename@^3.0.0:
84468458
version "3.0.0"
84478459
resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"

0 commit comments

Comments
 (0)