diff --git a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte index 6d1e94b05d0..da41753901c 100644 --- a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte +++ b/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 { + 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')} diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 10e776a80f2..b55a47dd980 100644 --- a/packages/desktop/package.json +++ b/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": "git@github.com:iotaledger/firefly.git", diff --git a/packages/shared/package.json b/packages/shared/package.json index 1ec9bab1617..3c836c70b44 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -7,11 +7,11 @@ "@iota/bundle": "^1.0.0-beta.30", "@iota/converter": "^1.0.0-beta.30", "@iota/crypto.js": "^1.8.6", + "@iota/sdk": "1.1.4", "@iota/transaction": "^1.0.0-beta.30", "@iota/transaction-converter": "^1.0.0-beta.30", "@iota/unit-converter": "^1.0.0-beta.30", "@iota/util.js": "^2.0.0-rc.1", - "@iota/sdk": "1.1.3", "@sveltejs/svelte-virtual-list": "^3.0.1", "big-integer": "^1.6.51", "big.js": "^6.0.3", diff --git a/yarn.lock b/yarn.lock index b2758dd7cb0..66d54b2f144 100644 --- a/yarn.lock +++ b/yarn.lock @@ -767,10 +767,10 @@ resolved "https://registry.yarnpkg.com/@iota/pad/-/pad-1.0.0-beta.30.tgz#de19728f8f1b09c20e2365d0da34945006760082" integrity sha512-fnhPMPul18WunLq9Ni4rxzBFmhna6eaG8WroDg6GdQqSK/eN62uFHV8tpspJHXuCqwgCUVp6NpuUna7+B2OV9g== -"@iota/sdk@1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.1.3.tgz#ab54cf72d9fa46321ae635cdd7fb2e085e888d95" - integrity sha512-Igy1Pl4mLPIGJddepcJ0i3xF/6Yup8pMl0eSTknN1A97qhsNtvmV1iDDhSxAshmJYyBQ8LEzd0DrMrq5tioYyg== +"@iota/sdk@1.1.4": + version "1.1.4" + resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.1.4.tgz#0661c6132c7632afcf7bf211e30d3e1b7bdddbb8" + integrity sha512-crcFQZzhsApDr44qBUTaIncGeArXjhuuY8+sjtOvNKz96S322MBmYiFVcyEOjtyeddBdo3J7YVWHx5eInYOmvw== dependencies: "@types/node" "^18.15.12" cargo-cp-artifact "^0.1.6" @@ -1712,11 +1712,18 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.38.tgz#1dcdb6c54d02b323f621213745f2e44af30c73e6" integrity sha512-6sfo1qTulpVbkxECP+AVrHV9OoJqhzCsfTNp5NIG+enM4HyM3HvZCO798WShIXBN0+QtDIcutJCjsVYnQP5rIQ== -"@types/node@^18.15.11", "@types/node@^18.15.12": +"@types/node@^18.15.11": version "18.16.19" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.19.tgz#cb03fca8910fdeb7595b755126a8a78144714eea" integrity sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA== +"@types/node@^18.15.12": + version "18.19.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.3.tgz#e4723c4cb385641d61b983f6fe0b716abd5f8fc0" + integrity sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg== + dependencies: + undici-types "~5.26.4" + "@types/plist@^3.0.1": version "3.0.2" resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" @@ -6256,9 +6263,9 @@ mz@^2.7.0: thenify-all "^1.0.0" nanoid@^3.1.31, nanoid@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== napi-build-utils@^1.0.1: version "1.0.2" @@ -6296,9 +6303,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-abi@^3.0.0, node-abi@^3.3.0, node-abi@^3.8.0: - version "3.51.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d" - integrity sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA== + version "3.52.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.52.0.tgz#ffba0a85f54e552547e5849015f40f9514d5ba7c" + integrity sha512-JJ98b02z16ILv7859irtXn4oUaFWADtvkzy2c0IAatNVX2Mc9Yoh8z6hZInn3QwvMEYhHuQloYi+TTQy67SIdQ== dependencies: semver "^7.3.5" @@ -7149,9 +7156,9 @@ rechoir@^0.8.0: resolve "^1.20.0" reflect-metadata@^0.1.13: - version "0.1.13" - resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" - integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== + version "0.1.14" + resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.14.tgz#24cf721fe60677146bb77eeb0e1f9dece3d65859" + integrity sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A== regexp-tree@~0.1.1: version "0.1.27" @@ -8442,6 +8449,11 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + unique-filename@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"