fix: 3id/ipfs conflicts with 3id-connect fix

3box · May 28, 2020 · a7a1d24 · a7a1d24
1 parent 5341310
commit a7a1d24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/iframe/html/template.js b/iframe/html/template.js
@@ -34,7 +34,7 @@ const template = (data,isMobile) => `
             </p>
           </div>
         </div>
-        <div class='${style.actions}' id=''>
+        <div class='${style.actions}' id='action'>
           <button id='accept' class='${style.primaryButton}' ${data.error ? 'style="display:none;"' : ''} >
             Continue
           </button>

diff --git a/src/threeIdConnect.js b/src/threeIdConnect.js
@@ -45,11 +45,12 @@ class ThreeIdConnect {
     document.body.appendChild(this.iframe)
   }
 
-  // Just passing ref to threeId and address during migration
-  async connect (provider, ThreeId) {
+  // Just passing ref to threeId and ipfs during migration
+  async connect (provider, ThreeId, ipfs) {
     // assumes eth provider during migration
     this.provider = provider
     this.ThreeId = ThreeId
+    this.ipfs = ipfs
     // after migration, can detect different provdier to create authProvider
     this.authProvider = new EthereumAuthProvider(provider)
   }
@@ -84,7 +85,7 @@ class ThreeIdConnect {
     */
   async _getThreeId (address) {
     if(!this._threeId) {
-      this._threeId = await this.ThreeId.getIdFromEthAddress(address, this.provider, fakeIpfs, undefined, {})
+      this._threeId = await this.ThreeId.getIdFromEthAddress(address, this.provider, this.ipfs, undefined, {})
     }
     return this._threeId
   }