@getpara/solana-wallet-connectors 2.0.0-alpha.33 → 2.0.0-alpha.34

package/dist/providers/SolanaExternalWalletContext.js

@@ -78,12 +78,6 @@ function SolanaExternalWalletProvider({
     yield disconnect();
     yield para.logout();
   });
-  const _reset = (..._0) => __async(this, [..._0], function* ({ logout = false } = {}) {
-    yield disconnect();
-    if (logout) {
-      yield para.logout();
-    }
-  });
   const login = (_0) => __async(this, [_0], function* ({
     address,
     providerId,
@@ -122,7 +116,7 @@ function SolanaExternalWalletProvider({
         try {
           yield login({
             address,
-            providerId: (_c = getWallet((_b = (_a = wallet == null ? void 0 : wallet.adapter) == null ? void 0 : _a.name) != null ? _b : "")) == null ? void 0 : _c.internalId,
+            providerId: (_c = getWallet((_b = (_a = wallet == null ? void 0 : wallet.adapter) == null ? void 0 : _a.name) != null ? _b : "")) == null ? void 0 : _c.id,
             providerName: (_d = wallet == null ? void 0 : wallet.adapter) == null ? void 0 : _d.name
           });
         } catch (err) {
@@ -233,7 +227,7 @@ function SolanaExternalWalletProvider({
       address = yield connectBase(adapter, true);
       if (address) {
         try {
-          authState = yield login({ address, providerId: (_a = getWallet(adapter.name)) == null ? void 0 : _a.internalId, providerName: adapter.name });
+          authState = yield login({ address, providerId: (_a = getWallet(adapter.name)) == null ? void 0 : _a.id, providerName: adapter.name });
           verificationMessage.current = authState.stage === "verify" ? authState.signatureVerificationMessage : void 0;
         } catch (err) {
           yield disconnect();
@@ -260,7 +254,7 @@ function SolanaExternalWalletProvider({
   });
   const requestInfo = (providerId) => __async(this, null, function* () {
     var _a, _b;
-    const wallet2 = wallets.find((w) => w.internalId === providerId);
+    const wallet2 = wallets.find((w) => w.id === providerId);
     const adapter = getAdapter((_a = wallet2.name) != null ? _a : "");
     isLinkingAccount.current = true;
     try {
@@ -269,7 +263,7 @@ function SolanaExternalWalletProvider({
         partnerId: para.partnerId,
         address,
         type: "SOLANA",
-        providerId: wallet2.internalId,
+        providerId: wallet2.id,
         provider: wallet2.name
       };
       return externalWallet;
@@ -280,7 +274,7 @@ function SolanaExternalWalletProvider({
   });
   const disconnectBase = (providerId) => __async(this, null, function* () {
     var _a, _b;
-    const wallet2 = wallets.find((w) => w.internalId === providerId);
+    const wallet2 = wallets.find((w) => w.id === providerId);
     const adapter = getAdapter((_a = wallet2.name) != null ? _a : "");
     if (!(adapter == null ? void 0 : adapter.connected)) {
       return;
@@ -301,12 +295,15 @@ function SolanaExternalWalletProvider({
   const createWallet = (walletFn) => {
     const metaData = walletFn();
     const adapter = getAdapter(metaData.name);
-    return __spreadValues({
+    return __spreadProps(__spreadValues({
       connect: () => connect(adapter),
       connectMobile: () => connect(adapter),
       type: "SOLANA",
       installed: adapter && ((adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Installed || (adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Loadable)
-    }, metaData);
+    }, metaData), {
+      // Using name here since that's the only common id across the networks
+      id: metaData.name
+    });
   };
   const [wallets, setWallets] = useState(() => walletFns.map(createWallet));
   const farcasterStatus = useMemo(() => {
@@ -353,12 +350,27 @@ function SolanaExternalWalletProvider({
     });
     setupFarcaster();
   }, [para.isFarcasterMiniApp, wallets, adapters]);
+  const injectedWallets = adapters.filter((wallet2) => wallet2.adapter.name !== "Mobile Wallet Adapter" && !wallets.some((w) => w.name === wallet2.adapter.name)).map((wallet2) => {
+    const adapter = wallet2.adapter;
+    return {
+      connect: () => connect(adapter),
+      connectMobile: () => connect(adapter),
+      type: "SOLANA",
+      installed: adapter && ((adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Installed || (adapter == null ? void 0 : adapter.readyState) === WalletReadyState.Loadable),
+      name: adapter.name,
+      iconUrl: adapter.icon,
+      // Using name here since that's the only common id across the networks
+      id: adapter.name,
+      internalId: adapter.name
+    };
+  });
+  const walletsWithInjected = [...wallets, ...injectedWallets];
   return /* @__PURE__ */ jsx(
     SolanaExternalWalletContext.Provider,
     {
       value: useMemo(
         () => __spreadValues({
-          wallets,
+          wallets: walletsWithInjected,
           disconnect,
           signMessage,
           signVerificationMessage,
@@ -366,7 +378,15 @@ function SolanaExternalWalletProvider({
           disconnectBase,
           farcasterStatus
         }, externalHooks),
-        [wallets, disconnect, signMessage, signVerificationMessage, requestInfo, farcasterStatus, disconnectBase]
+        [
+          walletsWithInjected,
+          disconnect,
+          signMessage,
+          signVerificationMessage,
+          requestInfo,
+          farcasterStatus,
+          disconnectBase
+        ]
       ),
       children
     }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@getpara/solana-wallet-connectors",
-  "version": "2.0.0-alpha.33",
+  "version": "2.0.0-alpha.34",
   "dependencies": {
-    "@getpara/react-common": "2.0.0-alpha.33",
-    "@getpara/web-sdk": "2.0.0-alpha.33",
+    "@getpara/react-common": "2.0.0-alpha.34",
+    "@getpara/web-sdk": "2.0.0-alpha.34",
     "bs58": "6.0.0"
   },
   "devDependencies": {
@@ -23,7 +23,7 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "f338306fa30497d2190f8da2ff72ddd8d9d9032f",
+  "gitHead": "cff5cb1fa7284a850e688b20a6596d435315a475",
   "main": "dist/index.js",
   "peerDependencies": {
     "@farcaster/mini-app-solana": "^1.0.0",