@xyo-network/xl1-react-client-sdk 4.0.1 → 4.0.2

package/dist/browser/client/components/connected/hooks/useConnectAccount.d.ts

@@ -5,7 +5,7 @@ export declare const useConnectAccount: (gatewayName?: GatewayName, timeout?: nu
     } & {
         readonly __address: true;
     }) | undefined;
-    connectSigner: () => Promise<import("@xyo-network/sdk-protocol").XyoQuantAddress | (Lowercase<string> & {
+    connectSigner: () => Promise<(Lowercase<string> & {
         readonly __hex: true;
     } & {
         readonly __address: true;

package/dist/browser/client/components/connected/hooks/useConnectAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useConnectAccount.d.ts","sourceRoot":"","sources":["../../../../../../src/client/components/connected/hooks/useConnectAccount.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAMvD,eAAO,MAAM,iBAAiB,GAAI,cAAa,WAA4B,EAAE,UAAU,MAAM;;;;;;;;;;;;;;CA2B5F,CAAA"}
+{"version":3,"file":"useConnectAccount.d.ts","sourceRoot":"","sources":["../../../../../../src/client/components/connected/hooks/useConnectAccount.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAcvD,eAAO,MAAM,iBAAiB,GAAI,cAAa,WAA4B,EAAE,UAAU,MAAM;;;;;;;;;;;;;;CAgC5F,CAAA"}

package/dist/browser/client/index.mjs

@@ -944,9 +944,17 @@ import { ButtonEx as ButtonEx5 } from "@xylabs/sdk-react";
 import { useEffect as useEffect4 } from "react";
 
 // src/client/components/connected/hooks/useConnectAccount.ts
-import { asAddress, assertEx } from "@xylabs/sdk";
+import {
+  asAddress,
+  assertEx,
+  isArray as isArray2,
+  isString as isString2
+} from "@xylabs/sdk";
 import { MainNetwork } from "@xyo-network/xl1-sdk";
 import { useCallback as useCallback4, useState as useState5 } from "react";
+var ACCOUNTS_CAPABILITY = "xyoWallet_getAccounts";
+var RESTRICT_RETURNED_ACCOUNTS = "restrictReturnedAccounts";
+var firstGrantedAccount = (grantedAccounts) => isArray2(grantedAccounts) && isString2(grantedAccounts[0]) ? grantedAccounts[0] : void 0;
 var useConnectAccount = (gatewayName = MainNetwork.id, timeout) => {
   const [connectError, setConnectError] = useState5();
   const {
@@ -955,19 +963,21 @@ var useConnectAccount = (gatewayName = MainNetwork.id, timeout) => {
     timedout
   } = useGatewayFromWallet(gatewayName, timeout);
   const [accountPermissions, accountPermissionsError] = useAccountPermissions();
+  const { permissions } = usePermissions();
   const [address, setAddress] = useState5();
   const connectSigner = useCallback4(async () => {
     try {
       setConnectError(void 0);
-      const assertedGateway = assertEx(gateway, () => `Gateway ${gatewayName} is not available`);
-      const signer = assertedGateway.signer;
-      const address2 = await signer.address();
-      setAddress(address2);
-      return address2;
+      const assertedPermissions = assertEx(permissions, () => "Wallet permissions are not available");
+      await assertedPermissions.requestPermissions([{ [ACCOUNTS_CAPABILITY]: {} }]);
+      const grantedAccounts = await findCaveat(assertedPermissions, ACCOUNTS_CAPABILITY, RESTRICT_RETURNED_ACCOUNTS);
+      const connectedAddress = firstGrantedAccount(grantedAccounts);
+      setAddress(connectedAddress);
+      return asAddress(connectedAddress);
     } catch (e) {
       setConnectError(e);
     }
-  }, [gateway, gatewayName]);
+  }, [permissions]);
   return {
     address: asAddress(accountPermissions?.[0] ?? address),
     connectSigner,