@meshconnect/web-link-sdk 3.1.0-rc.5 → 3.1.1

package/Link.js

@@ -170,7 +170,7 @@ function handleLinkEvent(event) {
 function handleWalletBrowserEvent(event) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var walletFactory, _b, payload, networkType, strategy, result, error_1, payload, networkType, strategy, result, error_2, payload, networkType, strategy, result, error_3, payload, networkType, strategy, result, error_4, payload, strategy, result, responseType, error_5, errorType, payload, networkType, strategy, error_6;
+        var walletFactory, _b, payload, networkType, strategy, result, error_1, payload, networkType, strategy, result, error_2, payload, networkType, strategy, result, error_3, payload, networkType, strategy, result, error_4, payload, getResponseType, strategy, result, responseType, error_5, errorType, payload, networkType, strategy, error_6;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -279,6 +279,18 @@ function handleWalletBrowserEvent(event) {
                 case 20: return [3 /*break*/, 34];
                 case 21:
                     payload = event.data.payload;
+                    getResponseType = function (type) {
+                        switch (type) {
+                            case 'walletBrowserNonNativeTransferRequest':
+                                return 'SDKnonNativeTransferCompleted';
+                            case 'walletBrowserNativeSmartDeposit':
+                                return 'SDKnativeSmartDepositCompleted';
+                            case 'walletBrowserNonNativeSmartDeposit':
+                                return 'SDKnonNativeSmartDepositCompleted';
+                            default:
+                                return 'SDKnonNativeTransferCompleted';
+                        }
+                    };
                     _c.label = 22;
                 case 22:
                     _c.trys.push([22, 24, , 25]);
@@ -286,11 +298,7 @@ function handleWalletBrowserEvent(event) {
                     return [4 /*yield*/, strategy.sendSmartContractInteraction(payload)];
                 case 23:
                     result = _c.sent();
-                    responseType = event.data.type === 'walletBrowserNonNativeTransferRequest'
-                        ? 'SDKnonNativeTransferCompleted'
-                        : event.data.type === 'walletBrowserNativeSmartDeposit'
-                            ? 'SDKnativeSmartDepositCompleted'
-                            : 'SDKnonNativeSmartDepositCompleted';
+                    responseType = getResponseType(event.data.type);
                     sendMessageToIframe({
                         type: responseType,
                         payload: {
@@ -300,11 +308,7 @@ function handleWalletBrowserEvent(event) {
                     return [3 /*break*/, 25];
                 case 24:
                     error_5 = _c.sent();
-                    errorType = event.data.type === 'walletBrowserNonNativeTransferRequest'
-                        ? 'SDKnonNativeTransferCompleted'
-                        : event.data.type === 'walletBrowserNativeSmartDeposit'
-                            ? 'SDKnativeSmartDepositCompleted'
-                            : 'SDKnonNativeSmartDepositCompleted';
+                    errorType = getResponseType(event.data.type);
                     handleErrorAndSendMessage(error_5, errorType);
                     return [3 /*break*/, 25];
                 case 25: return [3 /*break*/, 34];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meshconnect/web-link-sdk",
-  "version": "3.1.0-rc.5",
+  "version": "3.1.1",
   "description": "A client-side JS library for integrating with Mesh Connect",
   "exports": "./index.js",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "util": "^0.12.4"
   },
   "dependencies": {
-    "@meshconnect/node-api": "^2.0.16",
+    "@meshconnect/node-api": "^2.0.17",
     "@solana/web3.js": "^1.91.1",
     "bs58": "^5.0.0",
     "buffer": "^6.0.3",
@@ -60,4 +60,4 @@
   "module": "./index.js",
   "main": "./index.js",
   "types": "./index.d.ts"
-}
+}

package/utils/connectors/evm/types.d.ts

@@ -1,5 +1,4 @@
-import { ethers } from 'ethers';
-import { Eip1193Provider } from 'ethers';
+import { ethers, Eip1193Provider } from 'ethers';
 export interface EVMConnectResult {
     accounts: string[];
     chainId: number;

package/utils/connectors/evm/walletConnection.js

@@ -77,7 +77,6 @@ export var connectToEVMWallet = function (walletName, targetChainId, walletDetai
                 }
                 browserProvider = new ethers.BrowserProvider(provider);
                 setActiveEVMProvider(browserProvider, provider);
-                setupEventListeners(provider);
                 return [4 /*yield*/, provider.request({ method: 'eth_accounts' })];
             case 1:
                 existingAccounts = _a.sent();
@@ -121,19 +120,6 @@ export var connectToEVMWallet = function (walletName, targetChainId, walletDetai
         }
     });
 }); };
-/**
- * Sets up event listeners for the provider
- */
-var setupEventListeners = function (provider) {
-    var handleAccountsChanged = function (accounts) {
-        console.log('Accounts changed:', accounts);
-    };
-    var handleChainChanged = function (chainId) {
-        console.log('Chain changed:', parseInt(chainId, 16));
-    };
-    provider.on('accountsChanged', handleAccountsChanged);
-    provider.on('chainChanged', handleChainChanged);
-};
 /**
  * Disconnects from an EVM wallet
  */

package/utils/connectors/solana/connection.js

@@ -46,27 +46,30 @@ export var connectToSolanaWallet = function (walletName) { return __awaiter(void
             case 0:
                 _a.trys.push([0, 2, , 3]);
                 provider_1 = getSolanaProvider(walletName);
-                if (provider_1.publicKey && provider_1.isConnected) {
+                return [4 /*yield*/, provider_1
+                        .connect({ onlyIfTrusted: true })
+                        .catch(function () { return provider_1.connect(); })
+                    // Handle Phantom wallet which returns response.publicKey
+                ];
+            case 1:
+                response = _a.sent();
+                // Handle Phantom wallet which returns response.publicKey
+                if (response === null || response === void 0 ? void 0 : response.publicKey) {
                     return [2 /*return*/, {
-                            accounts: [provider_1.publicKey.toString()],
+                            accounts: [response.publicKey.toString()],
                             chainId: '101',
                             isConnected: true
                         }];
                 }
-                return [4 /*yield*/, provider_1.connect({ onlyIfTrusted: true }).catch(function () {
-                        // If eager connect fails, try regular connect
-                        return provider_1.connect();
-                    })];
-            case 1:
-                response = _a.sent();
-                if (!(response === null || response === void 0 ? void 0 : response.publicKey)) {
-                    throw new Error("".concat(walletName, " connection failed - no public key returned"));
+                // Handle other wallets that update provider.publicKey directly
+                if (provider_1.publicKey) {
+                    return [2 /*return*/, {
+                            accounts: [provider_1.publicKey.toString()],
+                            chainId: '101',
+                            isConnected: true
+                        }];
                 }
-                return [2 /*return*/, {
-                        accounts: [response.publicKey.toString()],
-                        chainId: '101',
-                        isConnected: true
-                    }];
+                throw new Error("".concat(walletName, " connection failed - no public key returned"));
             case 2:
                 error_1 = _a.sent();
                 return [2 /*return*/, error_1 instanceof Error

package/utils/types.d.ts

@@ -15,6 +15,7 @@ export interface AccountToken {
     account: Account;
     accessToken: string;
     refreshToken?: string;
+    tokenId?: string;
 }
 export interface Account {
     accountId: string;

package/utils/version.d.ts

@@ -1 +1 @@
-export declare const sdkVersion = "3.1.0-rc.5";
+export declare const sdkVersion = "3.1.1";

package/utils/version.js

@@ -1 +1 @@
-export var sdkVersion = '3.1.0-rc.5';
+export var sdkVersion = '3.1.1';