Merge pull request #3057 from dusk-network/feature-3056

web-wallet: Fix incorrect fee deduction (Allocate flow)
dusk-network · Nov 26, 2024 · 0b4d723 · 0b4d723
2 parents f2ae2ef + a9d4d9f
commit 0b4d723
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/web-wallet/CHANGELOG.md b/web-wallet/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix inconsistent terminology usage for "Mnemonic Phrase" [#3035]
 - Fix auto-sync not working after restoring a wallet [#3042]
 - Fix application crash on empty amount (Stake Flow) [#3036]
+- Fix incorrect fee deduction and negative UI display (Allocate flow) [#3056]
 
 ## [0.8.0] - 2024-11-19
 
@@ -375,6 +376,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#3035]: https://github.com/dusk-network/rusk/issues/3035
 [#3036]: https://github.com/dusk-network/rusk/issues/3036
 [#3042]: https://github.com/dusk-network/rusk/issues/3042
+[#3056]: https://github.com/dusk-network/rusk/issues/3056
 
 <!-- VERSIONS -->
 

diff --git a/web-wallet/src/lib/components/Allocate/Allocate.svelte b/web-wallet/src/lib/components/Allocate/Allocate.svelte
@@ -69,8 +69,8 @@
 
     if (difference !== 0n) {
       const transactionInfo = isShielding
-        ? await walletStore.shield(difference - fee, gas)
-        : await walletStore.unshield(-difference - fee, gas);
+        ? await walletStore.shield(difference, gas)
+        : await walletStore.unshield(-difference, gas);
 
       return transactionInfo.hash;
     }
@@ -276,9 +276,7 @@
           </dt>
           <dd class="review-transaction__value operation__review-amount">
             <span>
-              {isShielding
-                ? `${formatter(luxToDusk(unshieldedBalance - unshielded - fee))} DUSK`
-                : `${formatter(luxToDusk(shieldedBalance - shielded - fee))} DUSK`}
+              {`${formatter(luxToDusk(isShielding ? difference : -difference))} DUSK`}
             </span>
             <Icon
               className="dusk-amount__icon"
@@ -319,8 +317,7 @@
           <p>
             The fee will be deducted from your <b
               >{isUnshielding ? "shielded" : "public"}</b
-            > balance, with the maximum estimated fee reserved before allocation.
-            This guarantees sufficient coverage for the transaction.
+            > balance.
           </p>
         </Banner>
       </div>