Skip to content
This repository has been archived by the owner on Aug 9, 2021. It is now read-only.

Commit

Permalink
fix: dont assume metamask inject, have default fallback ui for other …
Browse files Browse the repository at this point in the history
…providers, later can map to specific ui
  • Loading branch information
zachferland committed Apr 19, 2020
1 parent fbe7af8 commit 5864cd8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 46 deletions.
39 changes: 0 additions & 39 deletions iframe/html/3IDConnect/index.js

This file was deleted.

12 changes: 6 additions & 6 deletions iframe/html/3IDConnect/providerSelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ const providerSelect = (data, isMobile) => `
${getProviderDisplayImage(data.request.opts.address)}
</div>
<h5 id='selectedWallet' class='${style.providerImageText}'>
${getProviderDisplayName(data.request.opts.address) || `Choose wallet`}
<h5 id='selectedWallet' class='${style.providerImageText}'>
${getProviderDisplayName(data.request.opts.address) || `Choose wallet`}
</h5>
</div>
</div>
<div class='${style.providerBox} ${isMobile ? style.providerBoxMobile : ''}' id='walletOptions' onClick="handleOpenWalletOptions()">
<div class='${style.provider}' onClick="providerNameFunc('injected', '${data.request.opts.address}', 'MetaMask')">
<div class='${style.provider}' onClick="providerNameFunc('injected', '${data.request.opts.address}', '${data.request.injectedMetamask ? 'MetaMask' : 'Default Wallet'}')">
<div class='${style.providerImage}'>
${assets.MetaMask}
${data.request.injectedMetamask ? assets.MetaMask : assets.Wallet}
</div>
<div class='${style.providerText}'> Metamask </div>
<div class='${style.providerText}'> ${data.request.injectedMetamask ? 'MetaMask' : 'Default Wallet'} </div>
</div>
<div class='${style.provider}' onClick="providerNameFunc('fortmatic', '${data.request.opts.address}', 'Fortmatic')">
Expand Down Expand Up @@ -62,4 +62,4 @@ const providerSelect = (data, isMobile) => `
</div>
`

export default providerSelect
export default providerSelect
5 changes: 4 additions & 1 deletion iframe/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ window.providerNameFunc = (provider, address, displayName) => {

window.getProviderDisplayImage = (address) => {
const imageToRender = store.get(`providerName_${address}`);
const image = imageToRender ? assets[imageToRender] : assets.Wallet;
const image = !imageToRender || imageToRender == 'Default Wallet' ? assets.Wallet : assets[imageToRender];
return image;
}

Expand Down Expand Up @@ -81,6 +81,9 @@ const idwService = new ThreeIdConnectService()
// IDW getConsent function. Consume IDW request, renders request to user, and resolve selection
const getConsent = async (req) => {
await idwService.displayIframe()
// TODO can handle ui for injected providers better, but for now metamask and not metamask ui
if (window.ethereum) req.injectedMetamask = window.ethereum.isMetaMask

await render(req)

const result = await new Promise((resolve, reject) => {
Expand Down

0 comments on commit 5864cd8

Please sign in to comment.