Merge pull request #2109 from dusk-network/feature-1570

web-wallet: Integration with latest wallet-js and Sync improvements

web-wallet/.eslintignore

@@ -4,10 +4,11 @@ node_modules
 /.svelte-kit
 /package
 .env
-.env.*
+.env.\*
 !.env.example
 
 # Ignore files for PNPM, NPM and YARN
+
 pnpm-lock.yaml
 package-lock.json
 yarn.lock

web-wallet/CHANGELOG.md

@@ -9,12 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Add option to sync from a custom block height on Wallet Restoration [#1568]
+- Show current block height on Wallet Creation [#1561]
 - Added gas settings validation on Unstake / Widthdraw Rewards flows [#2000]
 - Added allocation (shield/unshield) page and UI [#2196]
 - Added token migration contract bindings [#2014]
 
 ### Changed
 
+- Newly created Wallet does not sync from genesis [#1567]
 - Update font-display to swap for custom fonts to improve performance [#2026]
 - Update anchor colors to ensure better accessibility [#1765]
 - Update Transactions list design [#1922]
@@ -229,7 +232,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#1545]: https://github.com/dusk-network/rusk/issues/1545
 [#1547]: https://github.com/dusk-network/rusk/issues/1547
 [#1552]: https://github.com/dusk-network/rusk/issues/1552
+[#1561]: https://github.com/dusk-network/rusk/issues/1561
 [#1565]: https://github.com/dusk-network/rusk/issues/1565
+[#1568]: https://github.com/dusk-network/rusk/issues/1568
+[#1567]: https://github.com/dusk-network/rusk/issues/1567
 [#1576]: https://github.com/dusk-network/rusk/issues/1576
 [#1591]: https://github.com/dusk-network/rusk/issues/1591
 [#1598]: https://github.com/dusk-network/rusk/issues/1598

web-wallet/__mocks__/Wallet.js

@@ -1,13 +1,13 @@
 class Wallet {
-  constructor(seed, gasLimit = 2900000000, gasPrice = 1) {
-    this.gasLimit = gasLimit;
-    this.gasPrice = gasPrice;
+  constructor(seed) {
     this.seed = seed;
     this.wasm = {};
   }
 
-  gasLimit;
-  gasPrice;
+  static get networkBlockHeight() {
+    return Promise.resolve(0);
+  }
+
   seed;
   wasm;
 

web-wallet/package.json

@@ -35,7 +35,7 @@
   "type": "module",
   "version": "0.5.0",
   "dependencies": {
-    "@dusk-network/dusk-wallet-js": "0.4.2",
+    "@dusk-network/dusk-wallet-js": "0.5.3",
     "@floating-ui/dom": "1.6.5",
     "@mdi/js": "7.4.47",
     "@wagmi/connectors": "5.1.6",

web-wallet/src/__mocks__/mockedWalletStore.js

@@ -9,9 +9,8 @@ const content = {
   addresses,
   balance,
   currentAddress,
-  error: null,
   initialized: true,
-  isSyncing: false,
+  syncStatus: { current: 0, error: null, isInProgress: false, last: 0 },
 };
 
 const mockedWalletStore = mockReadableStore(content);

web-wallet/src/lib/components/CopyField/CopyField.css

@@ -0,0 +1,9 @@
+.copy-field {
+  display: flex;
+  align-items: center;
+  gap: var(--default-gap);
+}
+
+.copy-field__content {
+  flex: 1;
+}

web-wallet/src/lib/components/CopyField/CopyField.svelte

@@ -0,0 +1,55 @@
+<svelte:options immutable={true} />
+
+<script>
+  import "./CopyField.css";
+
+  import { mdiAlertOutline, mdiContentCopy } from "@mdi/js";
+  import { Button, Textbox } from "$lib/dusk/components";
+  import { toast } from "$lib/dusk/components/Toast/store";
+
+  /** @type {string} */
+  export let name;
+
+  /** @type {string} */
+  export let displayValue;
+
+  /** @type {string} */
+  export let rawValue;
+
+  /** @type {boolean} */
+  export let disabled = false;
+
+  function copyToClipboard() {
+    navigator.clipboard
+      .writeText(rawValue)
+      .then(() => {
+        toast("success", `${name} copied`, mdiContentCopy);
+      })
+      .catch((err) => {
+        toast(
+          "error",
+          err.name === "NotAllowedError"
+            ? "Clipboard access denied"
+            : err.message,
+          mdiAlertOutline
+        );
+      });
+  }
+</script>
+
+<div class="copy-field">
+  <Textbox
+    className="copy-field__content"
+    value={displayValue}
+    type="text"
+    readOnly
+  />
+  <Button
+    aria-label="Copy Address"
+    className="copy-field__button"
+    icon={{ path: mdiContentCopy }}
+    on:click={copyToClipboard}
+    variant="primary"
+    {disabled}
+  />
+</div>

web-wallet/src/lib/components/__tests__/CopyField.spec.js

@@ -0,0 +1,54 @@
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { cleanup, fireEvent, render } from "@testing-library/svelte";
+import { CopyField } from "..";
+
+Object.assign(navigator, {
+  clipboard: {
+    writeText: vi.fn().mockResolvedValue(""),
+  },
+});
+
+describe("CopyField", () => {
+  const baseProps = {
+    disabled: false,
+    displayValue: "1,234,567",
+    name: "Sample Information",
+    rawValue: "1234567",
+  };
+
+  const baseOptions = {
+    props: baseProps,
+    target: document.body,
+  };
+
+  afterEach(cleanup);
+
+  it("renders the CopyField component", () => {
+    const { container } = render(CopyField, baseOptions);
+
+    expect(container.firstChild).toMatchSnapshot();
+  });
+
+  it("renders the CopyField component with the copy button disabled", () => {
+    const { container, getByRole } = render(CopyField, {
+      ...baseOptions,
+      props: { ...baseProps, disabled: true },
+    });
+
+    const copyButton = getByRole("button");
+
+    expect(copyButton).toBeDisabled();
+
+    expect(container.firstChild).toMatchSnapshot();
+  });
+
+  it("copies the raw value on pressing the copy button", async () => {
+    const { getByRole } = render(CopyField, baseOptions);
+
+    const copyButton = getByRole("button");
+
+    await fireEvent.click(copyButton);
+
+    expect(navigator.clipboard.writeText).toHaveBeenCalledWith("1234567");
+  });
+});

web-wallet/src/lib/components/__tests__/__snapshots__/CopyField.spec.js.snap

@@ -0,0 +1,66 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`CopyField > renders the CopyField component 1`] = `
+<div
+  class="copy-field"
+>
+  <input
+    class="dusk-textbox dusk-textbox-text copy-field__content"
+    readonly=""
+    type="text"
+  />
+  
+   
+  <button
+    aria-label="Copy Address"
+    class="dusk-button dusk-button--type--button dusk-button--variant--primary dusk-button--size--default dusk-icon-button copy-field__button"
+    type="button"
+  >
+    <svg
+      class="dusk-icon dusk-icon--size--default dusk-button__icon"
+      role="graphics-symbol"
+      viewBox="0 0 24 24"
+    >
+      <path
+        d="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z"
+      />
+    </svg>
+    
+     
+    
+  </button>
+</div>
+`;
+
+exports[`CopyField > renders the CopyField component with the copy button disabled 1`] = `
+<div
+  class="copy-field"
+>
+  <input
+    class="dusk-textbox dusk-textbox-text copy-field__content"
+    readonly=""
+    type="text"
+  />
+  
+   
+  <button
+    aria-label="Copy Address"
+    class="dusk-button dusk-button--type--button dusk-button--variant--primary dusk-button--size--default dusk-icon-button copy-field__button"
+    disabled=""
+    type="button"
+  >
+    <svg
+      class="dusk-icon dusk-icon--size--default dusk-button__icon"
+      role="graphics-symbol"
+      viewBox="0 0 24 24"
+    >
+      <path
+        d="M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z"
+      />
+    </svg>
+    
+     
+    
+  </button>
+</div>
+`;

web-wallet/src/lib/components/index.js

@@ -7,6 +7,7 @@ export { default as ApproveMigration } from "./ApproveMigration/ApproveMigration
 export { default as Balance } from "./Balance/Balance.svelte";
 export { default as ContractOperations } from "./ContractOperations/ContractOperations.svelte";
 export { default as ContractStatusesList } from "./ContractStatusesList/ContractStatusesList.svelte";
+export { default as CopyField } from "./CopyField/CopyField.svelte";
 export { default as DashboardNav } from "./DashboardNav/DashboardNav.svelte";
 export { default as ExecuteMigration } from "./ExecuteMigration/ExecuteMigration.svelte";
 export { default as ExistingWalletNotice } from "./ExistingWalletNotice/ExistingWalletNotice.svelte";

web-wallet/src/lib/containers/Cards/IconHeadingCard.svelte

@@ -9,6 +9,9 @@
   /** @type {string} */
   export let heading;
 
+  /** @type {string | Undefined} */
+  export let className = undefined;
+
   /** @type {CardGap} */
   export let gap = "default";
 
@@ -19,7 +22,7 @@
   export let reverse = false;
 </script>
 
-<Card {...$$restProps} {gap} {onSurface}>
+<Card {...$$restProps} {className} {gap} {onSurface}>
   <header slot="header" class="dusk-card__header">
     <div
       class="dusk-card__heading-container"

web-wallet/src/lib/containers/Cards/ToggleableCard.svelte

@@ -1,5 +1,6 @@
 <script>
   import { Card, Icon, Switch } from "$lib/dusk/components";
+  import { createEventDispatcher } from "svelte";
 
   import "./Card.css";
 
@@ -17,6 +18,12 @@
 
   /** @type {boolean} */
   export let isToggled = false;
+
+  const dispatch = createEventDispatcher();
+
+  function dispatchToggleEvent() {
+    dispatch("toggle", { isToggled });
+  }
 </script>
 
 <Card {...$$restProps} {gap} {onSurface}>
@@ -27,7 +34,7 @@
       {/if}
       <h3 class="h4">{heading}</h3>
     </div>
-    <Switch onSurface bind:value={isToggled} />
+    <Switch onSurface bind:value={isToggled} on:change={dispatchToggleEvent} />
   </header>
   {#if isToggled}
     <slot />