From 006d3006804bb0173c9affbb9a952bff6f9c5c6f Mon Sep 17 00:00:00 2001
From: rodrigopavezi <rodrigopavezi@gmail.com>
Date: Wed, 18 Dec 2024 00:17:30 -0300
Subject: [PATCH 1/2] feat: Enhance wallet connection handling in Create
 Invoice Form and View Requests

- Added wallet connection and disconnection handling in Create Invoice Form using `watchAccount`.
- Improved state management for account and cipher provider in View Requests.
- Refactored wallet change logic for better clarity and functionality.
---
 .../src/lib/create-invoice-form.svelte        | 41 +++++++++++++++----
 .../src/lib/view-requests.svelte              |  6 +--
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/packages/create-invoice-form/src/lib/create-invoice-form.svelte b/packages/create-invoice-form/src/lib/create-invoice-form.svelte
index 92f16cf0..29ee6992 100644
--- a/packages/create-invoice-form/src/lib/create-invoice-form.svelte
+++ b/packages/create-invoice-form/src/lib/create-invoice-form.svelte
@@ -1,7 +1,7 @@
 <svelte:options customElement="create-invoice-form" />
 
 <script lang="ts">
-  import { getAccount } from "@wagmi/core";
+  import { getAccount, watchAccount, WatchAccountReturnType } from "@wagmi/core";
   import { Config as WagmiConfig } from "wagmi";
   // Types
   import { type GetAccountReturnType } from "@wagmi/core";
@@ -24,6 +24,7 @@
   import Status from "@requestnetwork/shared-components/status.svelte";
   import Modal from "@requestnetwork/shared-components/modal.svelte";
   import { EncryptionTypes, CipherProviderTypes } from "@requestnetwork/types";
+    import { onDestroy, onMount, tick } from "svelte";
 
   interface CipherProvider extends CipherProviderTypes.ICipherProvider {
     disconnectWallet: () => void;
@@ -35,7 +36,7 @@
   export let currencies: CurrencyTypes.CurrencyInput[] = [];
   let cipherProvider: CipherProvider | undefined;
 
-  let account: GetAccountReturnType;
+  let account: GetAccountReturnType | undefined = wagmiConfig && getAccount(wagmiConfig);
   let isTimeout = false;
   let activeConfig = config ? config : defaultConfig;
   let mainColor = activeConfig.colors.main;
@@ -121,12 +122,38 @@
 
   $: cipherProvider = requestNetwork?.getCipherProvider() as CipherProvider;
 
-  $: {
-    if (wagmiConfig) {
-      account = getAccount(wagmiConfig);
-      cipherProvider?.disconnectWallet();
+  const handleWalletConnection = async () => {
+    account = getAccount(wagmiConfig);
+  };
+
+  const handleWalletDisconnection = () => {
+    cipherProvider?.disconnectWallet();
+  };
+
+  const handleWalletChange = (data: any) => {
+    if (data?.address) {
+      handleWalletConnection();
+    } else {
+      handleWalletDisconnection();
     }
-  }
+  };
+
+  onMount(() => {
+    unwatchAccount = watchAccount(wagmiConfig, {
+      onChange(data) {
+        tick().then(() => {
+          console.log("Wallet changed");
+          handleWalletChange(data);
+        });
+      },
+    });
+  });
+
+  let unwatchAccount: WatchAccountReturnType | undefined;
+
+  onDestroy(() => {
+    if (typeof unwatchAccount === "function") unwatchAccount();
+  });
 
   $: {
     formData.creatorId = (account?.address ?? "") as string;
diff --git a/packages/invoice-dashboard/src/lib/view-requests.svelte b/packages/invoice-dashboard/src/lib/view-requests.svelte
index 238e5cf4..52e8d2fa 100644
--- a/packages/invoice-dashboard/src/lib/view-requests.svelte
+++ b/packages/invoice-dashboard/src/lib/view-requests.svelte
@@ -109,11 +109,11 @@
   };
 
   const handleWalletDisconnection = () => {
-    cipherProvider?.disconnectWallet();
+    account = undefined;
     requests = [];
     activeRequest = undefined;
+    cipherProvider?.disconnectWallet();
     cipherProvider = undefined;
-    account = undefined;
   };
 
   const handleWalletChange = (data: any) => {
@@ -384,7 +384,7 @@
   };
 
   const loadRequests = async (sliderValue: string, currentAccount: GetAccountReturnType, currentRequestNetwork: RequestNetwork | undefined | null) => {
-    if (!currentAccount?.address || !currentRequestNetwork && !cipherProvider) return;
+    if (!currentAccount?.address || !currentRequestNetwork || !cipherProvider) return;
 
     loading = true;
     if (sliderValue === "on") {

From d7922f6cad02fdf94aefa7d756da4c1abf0d4427 Mon Sep 17 00:00:00 2001
From: rodrigopavezi <rodrigopavezi@gmail.com>
Date: Wed, 18 Dec 2024 00:21:39 -0300
Subject: [PATCH 2/2] chore: bumb version

---
 packages/create-invoice-form/CHANGELOG.md | 6 ++++++
 packages/create-invoice-form/package.json | 2 +-
 packages/invoice-dashboard/CHANGELOG.md   | 6 ++++++
 packages/invoice-dashboard/package.json   | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/create-invoice-form/CHANGELOG.md b/packages/create-invoice-form/CHANGELOG.md
index 821b8663..c280697e 100644
--- a/packages/create-invoice-form/CHANGELOG.md
+++ b/packages/create-invoice-form/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @requestnetwork/create-invoice-form
 
+## 0.11.12
+
+### Patch Changes
+
+- Fix Lit Encryption and Wallet Connections
+
 ## 0.11.11
 
 ### Patch Changes
diff --git a/packages/create-invoice-form/package.json b/packages/create-invoice-form/package.json
index 237f0b4f..b51f16e8 100644
--- a/packages/create-invoice-form/package.json
+++ b/packages/create-invoice-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@requestnetwork/create-invoice-form",
-  "version": "0.11.11",
+  "version": "0.11.12",
   "main": "./dist/web-component.umd.cjs",
   "scripts": {
     "dev": "vite dev",
diff --git a/packages/invoice-dashboard/CHANGELOG.md b/packages/invoice-dashboard/CHANGELOG.md
index d95af58a..1fe4f972 100644
--- a/packages/invoice-dashboard/CHANGELOG.md
+++ b/packages/invoice-dashboard/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @requestnetwork/invoice-dashboard
 
+## 0.11.10
+
+### Patch Changes
+
+- Fix Lit Encryption and Wallet Connections
+
 ## 0.11.9
 
 ### Patch Changes
diff --git a/packages/invoice-dashboard/package.json b/packages/invoice-dashboard/package.json
index 8438f1dc..f2f5c129 100644
--- a/packages/invoice-dashboard/package.json
+++ b/packages/invoice-dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@requestnetwork/invoice-dashboard",
-  "version": "0.11.9",
+  "version": "0.11.10",
   "main": "./dist/web-component.umd.cjs",
   "scripts": {
     "dev": "vite dev",