stackswap-front-api-test-02 1.3.2 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackswap-front-api-test-02",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "",
   "scripts": {
     "start": "tsc -b tsconfig.build.json --watch --verbose",

package/src/index.ts

@@ -145,15 +145,28 @@ export class StackswapMainnetAPI implements StackswapAPI{
   walletConnect(callback: (err: any, result: any) => void): void {
     connect()
       .then((result) => {
+        // DEBUG: Log connect() result to understand address selection
+        console.log('[walletConnect] connect() raw result:', JSON.stringify(result, null, 2));
+
         // STX addresses start with 'SP' (mainnet) or 'ST' (testnet)
         const stxAddresses = result.addresses.filter(a =>
           a.address.startsWith('SP') || a.address.startsWith('ST')
         );
+
+        console.log('[walletConnect] STX addresses found:', stxAddresses);
+        console.log('[walletConnect] isMainnet:', this.config.isMainnet());
+
         const address = this.config.isMainnet()
           ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
           : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
 
+        console.log('[walletConnect] Selected address:', address);
+
         if (address) {
+          // Save current address to localStorage for isConnected() to use
+          if (typeof window !== 'undefined' && window.localStorage) {
+            window.localStorage.setItem('currentStxAddress', address);
+          }
           this.senderAdderss = address;
           this.connected = true;
           callback(null, this.senderAdderss);
@@ -203,6 +216,10 @@ export class StackswapMainnetAPI implements StackswapAPI{
   signOut(callback: (err: any, result: any) => void): void {
     try {
       disconnect();
+      // Clear saved current address
+      if (typeof window !== 'undefined' && window.localStorage) {
+        window.localStorage.removeItem('currentStxAddress');
+      }
       this.connected = false;
       this.senderAdderss = '';
       callback(null, 'success');
@@ -213,21 +230,52 @@ export class StackswapMainnetAPI implements StackswapAPI{
 
   isConnected(): boolean {
     try {
+      console.log('[isConnected] isWalletConnected():', isWalletConnected());
       if (!isWalletConnected()) {
         return false;
       }
 
+      // First, check if we have a saved current address from walletConnect()
+      let savedAddress: string | null = null;
+      if (typeof window !== 'undefined' && window.localStorage) {
+        savedAddress = window.localStorage.getItem('currentStxAddress');
+        console.log('[isConnected] Saved currentStxAddress:', savedAddress);
+      }
+
+      // Validate saved address matches network (SP for mainnet, ST for testnet)
+      if (savedAddress) {
+        const isValidForNetwork = this.config.isMainnet()
+          ? savedAddress.startsWith('SP')
+          : savedAddress.startsWith('ST');
+
+        if (isValidForNetwork) {
+          console.log('[isConnected] Using saved address:', savedAddress);
+          this.senderAdderss = savedAddress;
+          this.connected = true;
+          return true;
+        }
+      }
+
+      // Fallback: use getLocalStorage() if no saved address
       const storage = getLocalStorage();
+      console.log('[isConnected] getLocalStorage():', JSON.stringify(storage, null, 2));
+
       if (!storage || !storage.addresses?.stx?.length) {
+        console.log('[isConnected] No storage or no STX addresses');
         return false;
       }
 
       const stxAddresses = storage.addresses.stx;
+      console.log('[isConnected] STX addresses:', stxAddresses);
+      console.log('[isConnected] isMainnet:', this.config.isMainnet());
+
       // SP = mainnet, ST = testnet
       const address = this.config.isMainnet()
         ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
         : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
 
+      console.log('[isConnected] Selected address:', address);
+
       if (address) {
         this.senderAdderss = address;
         this.connected = true;
@@ -235,6 +283,7 @@ export class StackswapMainnetAPI implements StackswapAPI{
       }
       return false;
     } catch (e) {
+      console.log('[isConnected] Error:', e);
       return false;
     }
   }