Merge pull request #23 from labscommunity/kranthi/ensurePermissions

fix: ensurepermissions without disconnecting

package.json

@@ -1,7 +1,7 @@
 {
   "name": "arweave-wallet-kit",
   "private": false,
-  "version": "1.0.6",
+  "version": "1.0.7",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -58,7 +58,7 @@
     "@types/react-dom": "^18.0.10",
     "@types/react-helmet": "^6.1.6",
     "@vitejs/plugin-react": "^3.0.0",
-    "arconnect": "^1.0.3",
+    "arconnect": "^1.0.4",
     "babel-loader": "^8.3.0",
     "prettier": "^2.8.2",
     "react": "^18.2.0",

src/hooks/permissions.ts

@@ -2,7 +2,8 @@ import type { ConnectMsg } from "./connection/connect";
 import { STRATEGY_STORE } from "../strategy";
 import useActiveStrategy from "./strategy";
 import useGlobalState from "./global";
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
+import { comparePermissions } from "../utils";
 import type { PermissionType } from "arconnect";
 
 /**
@@ -39,8 +40,10 @@ export default function usePermissions(): PermissionType[] {
 
 // sync permissions in global state
 export function useSyncPermissions() {
+  const isReconnecting = useRef(false);
   const { state, dispatch } = useGlobalState();
   const strategy = useActiveStrategy();
+  const { permissions: requiredPermissions, ensurePermissions } = state.config;
 
   useEffect(() => {
     // sync permissions
@@ -55,12 +58,30 @@ export function useSyncPermissions() {
 
       try {
         const permissions = await strategy.getPermissions();
+        const hasPermissions = comparePermissions(
+          requiredPermissions,
+          permissions
+        );
 
         dispatch({
           type: "UPDATE_PERMISSIONS",
           payload: permissions
         });
 
+        if (requiredPermissions.length === 0 && ensurePermissions) {
+          fixupDisconnection();
+          return;
+        }
+
+        if (!hasPermissions && ensurePermissions && !isReconnecting.current) {
+          isReconnecting.current = true;
+          await strategy.connect(
+            requiredPermissions,
+            state.config.appInfo,
+            state.config.gatewayConfig
+          );
+        }
+
         if (permissions.length === 0) {
           fixupDisconnection();
         }
@@ -130,5 +151,5 @@ export function useSyncPermissions() {
         strategy.removeAddressEvent(addressChangeSync);
       }
     };
-  }, [strategy, dispatch]);
+  }, [strategy, requiredPermissions, dispatch]);
 }

src/strategy/strategies/ArConnect.ts

@@ -1,6 +1,7 @@
 import BrowserWalletStrategy from "./BrowserWallet";
 import { callWindowApi } from "../../utils";
 import type Strategy from "../Strategy";
+import type { DataItem } from "arconnect";
 
 export default class ArConnectStrategy
   extends BrowserWalletStrategy
@@ -31,4 +32,8 @@ export default class ArConnectStrategy
   public async addToken(id: string): Promise<void> {
     return await callWindowApi("addToken", [id]);
   }
+
+  public async batchSignDataItem(dataItems: DataItem[]): Promise<ArrayBufferLike[]> {
+    return await callWindowApi("batchSignDataItem", [dataItems]);
+  }
 }