Bugfix iframe url + merged missing main changes

CHANGELOG.md

@@ -24,6 +24,9 @@ Breaking changes:
     - Removed `TestWallets`
     - Use added function `loadTestWallets` (or `loadInteractive`)
 
+## [6.6.1]
+-   [Bugfixed WalletProvider by adding possibility to match iframe by id #53](https://github.com/ElrondNetwork/elrond-sdk-erdjs/pull/53)
+
 ## [6.6.0]
 -   [Added signature to walletConnectProvider to handle Token Login #49](https://github.com/ElrondNetwork/elrond-sdk-erdjs/pull/49)
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@elrondnetwork/erdjs",
-    "version": "6.6.0",
+    "version": "6.6.1",
     "description": "Smart Contracts interaction framework",
     "main": "out/index.js",
     "types": "out/index.d.js",

src/dapp/walletConnectProvider.ts

@@ -44,14 +44,8 @@ export class WalletConnectProvider implements IDappProvider {
           this.walletConnector.accounts.length
         ) {
             const [account] = this.walletConnector.accounts;
-            if (account.includes(".")) {
-                const address = account.split(".");
-                if (address.length > 0) {
-                    this.loginAccount(address[0], address[1]);
-                }
-            } else {
-                this.loginAccount(account);
-            }
+            const [address, signature] = account.split(".");
+            await this.loginAccount(address, signature);
         }
 
         return true;
@@ -220,14 +214,8 @@ export class WalletConnectProvider implements IDappProvider {
             accounts: [account],
         } = params[0];
 
-        if (account.includes(".")) {
-            const address = account.split(".");
-            if (address.length > 0) {
-                let _ = this.loginAccount(address[0], address[1]);
-            }
-        } else {
-            let _ = this.loginAccount(account);
-        }
+        const [address, signature] = account.split(".");
+        await this.loginAccount(address, signature);
     }
 
     private async onDisconnect(error: any) {

src/dapp/walletProvider.ts

@@ -16,14 +16,17 @@ import { ErrNotImplemented } from "../errors";
 
 export class WalletProvider implements IDappProvider {
     walletUrl: string;
+    customId: string;
     mainFrame: HTMLIFrameElement | undefined;
 
     /**
      * Creates a new WalletProvider
      * @param walletURL
+     * @param customId
      */
-    constructor(walletURL: string = '') {
+    constructor(walletURL: string = '', customId = '') {
         this.walletUrl = walletURL;
+        this.customId = customId;
         this.attachMainFrame();
         let _ = this.init();
     }
@@ -396,7 +399,12 @@ export class WalletProvider implements IDappProvider {
     }
 
     private attachMainFrame() {
-        const currentMainframe = <HTMLIFrameElement>document.querySelector(`iframe[src="${this.walletUrl}"]`);
+        let currentMainframe: HTMLIFrameElement|null;
+        if (this.customId) {
+            currentMainframe = document.querySelector(`iframe[id="${this.customId}"]`);
+        } else {
+            currentMainframe = document.querySelector(`iframe[src="${this.walletUrl}"]`);
+        }
         if (currentMainframe) {
             this.mainFrame = currentMainframe;
             return;