Merge pull request #3074 from dusk-network/feature-3073

web-wallet: Remove "Shield More Dusk" CTA
dusk-network · Nov 27, 2024 · 61e7a3b · 61e7a3b
2 parents 382858a + 01b482c
commit 61e7a3b
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 141 deletions.
diff --git a/web-wallet/CHANGELOG.md b/web-wallet/CHANGELOG.md
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- Remove "Shield More Dusk" CTA (Send flow) [#3073]
+
 ### Fixed
 
 - Fix "passphrase" terminology usage with "Mnemonic Phrase" [#3069]
@@ -397,6 +399,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#3061]: https://github.com/dusk-network/rusk/issues/3061
 [#3069]: https://github.com/dusk-network/rusk/issues/3069
 [#3071]: https://github.com/dusk-network/rusk/issues/3071
+[#3073]: https://github.com/dusk-network/rusk/issues/3073
 
 <!-- VERSIONS -->
 

diff --git a/web-wallet/src/lib/components/Send/Send.svelte b/web-wallet/src/lib/components/Send/Send.svelte
@@ -24,7 +24,6 @@
   } from "$lib/dusk/components";
   import { toast } from "$lib/dusk/components/Toast/store";
   import {
-    AppAnchorButton,
     Banner,
     ContractStatusesList,
     GasFee,
@@ -52,9 +51,6 @@
   /** @type {GasStoreContent} */
   export let gasLimits;
 
-  /** @type {boolean} */
-  export let enableAllocateButton = false;
-
   /** @type {boolean} */
   export let enableMoonlightTransactions = false;
 
@@ -171,6 +167,7 @@
       }}
     >
       <div in:fade|global class="operation__send">
+        <ContractStatusesList {statuses} />
         <div class="operation__address-wrapper">
           <p>Address:</p>
           <Button
@@ -204,16 +201,6 @@
             {/if}
           </Banner>
         {/if}
-        <ContractStatusesList {statuses}>
-          {#if enableAllocateButton}
-            <AppAnchorButton
-              className="allocate-button"
-              href="/dashboard/allocate"
-              text="Shield more DUSK"
-              variant="tertiary"
-            />
-          {/if}
-        </ContractStatusesList>
         <ScanQR
           bind:this={scanQrComponent}
           bind:scanner
@@ -239,16 +226,7 @@
       }}
     >
       <div in:fade|global class="operation__send">
-        <ContractStatusesList {statuses}>
-          {#if enableAllocateButton}
-            <AppAnchorButton
-              className="allocate-button"
-              href="/dashboard/allocate"
-              text="Shield more DUSK"
-              variant="tertiary"
-            />
-          {/if}
-        </ContractStatusesList>
+        <ContractStatusesList {statuses} />
 
         <div class="operation__amount-wrapper">
           <p>Amount:</p>

diff --git a/web-wallet/src/lib/components/__tests__/__snapshots__/Send.spec.js.snap b/web-wallet/src/lib/components/__tests__/__snapshots__/Send.spec.js.snap
@@ -81,6 +81,43 @@ exports[`Send > Address step > should display a warning if the address input is
     <div
       class="operation__send svelte-npcavd"
     >
+      <div
+        class="contract-statuses svelte-1up3579"
+      >
+        <dl
+          class="contract-statuses__list svelte-1up3579"
+        >
+          <dt
+            class="contract-statuses__label svelte-1up3579"
+          >
+            Spendable
+             
+          </dt>
+          <dd
+            class="contract-statuses__value svelte-1up3579"
+          >
+            <span>
+              1,000.000000000
+            </span>
+             
+            <svg
+              class="dusk-icon dusk-icon--size--default contract-statuses__icon"
+              data-tooltip-id="main-tooltip"
+              data-tooltip-text="DUSK"
+              role="graphics-symbol"
+              viewBox="0 0 24 24"
+            >
+              <path
+                d="M12.335 0.005a12.186 12.186 0 0 0 -2.58 0.204C4.2 1.259 0 6.14 0 11.999 0 17.859 4.203 22.74 9.759 23.79c0.726 0.138 1.476 0.21 2.241 0.21 6.789 0 12.261 -5.64 11.991 -12.49C23.741 5.249 18.599 0.173 12.335 0.005Zm0.207 21.58c-0.204 0.012 -0.336 -0.222 -0.21 -0.384 1.974 -2.541 3.153 -5.733 3.153 -9.202 0 -3.468 -1.176 -6.663 -3.153 -9.202 -0.126 -0.162 0.003 -0.396 0.207 -0.384 5.052 0.282 9.06 4.465 9.06 9.586 0 5.121 -4.005 9.304 -9.057 9.586Z"
+              />
+            </svg>
+            
+             
+          </dd>
+        </dl>
+         
+      </div>
+       
       <div
         class="operation__address-wrapper svelte-npcavd"
       >
@@ -135,44 +172,6 @@ exports[`Send > Address step > should display a warning if the address input is
         </div>
       </div>
        
-      <div
-        class="contract-statuses svelte-1up3579"
-      >
-        <dl
-          class="contract-statuses__list svelte-1up3579"
-        >
-          <dt
-            class="contract-statuses__label svelte-1up3579"
-          >
-            Spendable
-             
-          </dt>
-          <dd
-            class="contract-statuses__value svelte-1up3579"
-          >
-            <span>
-              1,000.000000000
-            </span>
-             
-            <svg
-              class="dusk-icon dusk-icon--size--default contract-statuses__icon"
-              data-tooltip-id="main-tooltip"
-              data-tooltip-text="DUSK"
-              role="graphics-symbol"
-              viewBox="0 0 24 24"
-            >
-              <path
-                d="M12.335 0.005a12.186 12.186 0 0 0 -2.58 0.204C4.2 1.259 0 6.14 0 11.999 0 17.859 4.203 22.74 9.759 23.79c0.726 0.138 1.476 0.21 2.241 0.21 6.789 0 12.261 -5.64 11.991 -12.49C23.741 5.249 18.599 0.173 12.335 0.005Zm0.207 21.58c-0.204 0.012 -0.336 -0.222 -0.21 -0.384 1.974 -2.541 3.153 -5.733 3.153 -9.202 0 -3.468 -1.176 -6.663 -3.153 -9.202 -0.126 -0.162 0.003 -0.396 0.207 -0.384 5.052 0.282 9.06 4.465 9.06 9.586 0 5.121 -4.005 9.304 -9.057 9.586Z"
-              />
-            </svg>
-            
-             
-          </dd>
-        </dl>
-         
-        
-      </div>
-       
       <div
         class="scan svelte-1uf7z44"
       >
@@ -346,33 +345,6 @@ exports[`Send > Address step > should render the Send component Address step 1`]
     <div
       class="operation__send svelte-npcavd"
     >
-      <div
-        class="operation__address-wrapper svelte-npcavd"
-      >
-        <p>
-          Address:
-        </p>
-         
-        <button
-          class="dusk-button dusk-button--type--button dusk-button--variant--primary dusk-button--size--small"
-          disabled=""
-          type="button"
-        >
-          <span
-            class="dusk-button__text"
-          >
-            SCAN QR
-          </span>
-        </button>
-      </div>
-       
-      <textarea
-        class="dusk-textbox dusk-textbox-multiline operation__send-address operation__send-address--invalid"
-        required=""
-      />
-      
-       
-       
       <div
         class="contract-statuses svelte-1up3579"
       >
@@ -408,9 +380,35 @@ exports[`Send > Address step > should render the Send component Address step 1`]
           </dd>
         </dl>
          
-        
       </div>
        
+      <div
+        class="operation__address-wrapper svelte-npcavd"
+      >
+        <p>
+          Address:
+        </p>
+         
+        <button
+          class="dusk-button dusk-button--type--button dusk-button--variant--primary dusk-button--size--small"
+          disabled=""
+          type="button"
+        >
+          <span
+            class="dusk-button__text"
+          >
+            SCAN QR
+          </span>
+        </button>
+      </div>
+       
+      <textarea
+        class="dusk-textbox dusk-textbox-multiline operation__send-address operation__send-address--invalid"
+        required=""
+      />
+      
+       
+       
       <div
         class="scan svelte-1uf7z44"
       >
@@ -622,19 +620,6 @@ exports[`Send > Amount step > should render the Send component Amount state with
           </dd>
         </dl>
          
-        <a
-          aria-disabled="false"
-          class="dusk-anchor dusk-anchor--on-surface dusk-anchor-button dusk-anchor-button--variant--tertiary dusk-anchor-button--size--default allocate-button"
-          href="/some-base-path/dashboard/allocate"
-        >
-          <span
-            class="dusk-anchor-button__text"
-          >
-            Shield more DUSK
-          </span>
-          
-        </a>
-        
       </div>
        
       <div
@@ -924,7 +909,6 @@ exports[`Send > Amount step > should render the Send component Amount step 1`] =
           </dd>
         </dl>
          
-        
       </div>
        
       <div

diff --git a/web-wallet/src/routes/(app)/dashboard/send/+page.svelte b/web-wallet/src/routes/(app)/dashboard/send/+page.svelte
@@ -59,7 +59,6 @@
     {gasSettings}
     {spendable}
     {statuses}
-    enableAllocateButton={import.meta.env.VITE_FEATURE_ALLOCATE === "true"}
     enableMoonlightTransactions={import.meta.env
       .VITE_FEATURE_MOONLIGHT_TRANSACTIONS === "true"}
     on:keyChange={keyChangeHandler}

diff --git a/web-wallet/src/routes/(app)/dashboard/send/__tests__/__snapshots__/page.spec.js.snap b/web-wallet/src/routes/(app)/dashboard/send/__tests__/__snapshots__/page.spec.js.snap
@@ -123,33 +123,6 @@ exports[`Send page > should render the send page 1`] = `
         <div
           class="operation__send svelte-npcavd"
         >
-          <div
-            class="operation__address-wrapper svelte-npcavd"
-          >
-            <p>
-              Address:
-            </p>
-             
-            <button
-              class="dusk-button dusk-button--type--button dusk-button--variant--primary dusk-button--size--small"
-              disabled=""
-              type="button"
-            >
-              <span
-                class="dusk-button__text"
-              >
-                SCAN QR
-              </span>
-            </button>
-          </div>
-           
-          <textarea
-            class="dusk-textbox dusk-textbox-multiline operation__send-address operation__send-address--invalid"
-            required=""
-          />
-          
-           
-           
           <div
             class="contract-statuses svelte-1up3579"
           >
@@ -185,21 +158,35 @@ exports[`Send page > should render the send page 1`] = `
               </dd>
             </dl>
              
-            <a
-              aria-disabled="false"
-              class="dusk-anchor dusk-anchor--on-surface dusk-anchor-button dusk-anchor-button--variant--tertiary dusk-anchor-button--size--default allocate-button"
-              href="/some-base-path/dashboard/allocate"
+          </div>
+           
+          <div
+            class="operation__address-wrapper svelte-npcavd"
+          >
+            <p>
+              Address:
+            </p>
+             
+            <button
+              class="dusk-button dusk-button--type--button dusk-button--variant--primary dusk-button--size--small"
+              disabled=""
+              type="button"
             >
               <span
-                class="dusk-anchor-button__text"
+                class="dusk-button__text"
               >
-                Shield more DUSK
+                SCAN QR
               </span>
-              
-            </a>
-            
+            </button>
           </div>
            
+          <textarea
+            class="dusk-textbox dusk-textbox-multiline operation__send-address operation__send-address--invalid"
+            required=""
+          />
+          
+           
+           
           <div
             class="scan svelte-1uf7z44"
           >