Skip to content

Commit b0ebaf6

Browse files
show registry at all times
1 parent 05f275d commit b0ebaf6

File tree

6 files changed

+76
-71
lines changed

6 files changed

+76
-71
lines changed

demo/vue-app-new/package-lock.json

Lines changed: 63 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/base/src/utils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export interface WalletRegistryItem {
2727
sdks: string[];
2828
};
2929
app?: {
30+
browser?: string;
3031
android?: string;
3132
ios?: string;
3233
chrome?: string;

packages/modal/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"prettier --write"
3939
]
4040
},
41-
"main": "dist/modal.cjs.js",
42-
"module": "dist/modal.esm.js",
41+
"main": "dist/lib.cjs/index.js",
42+
"module": "dist/lib.esm/index.js",
4343
"name": "@web3auth/modal",
4444
"peerDependencies": {
4545
"@babel/runtime": "^7.x",

packages/modal/src/modalManager.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
380380
Object.keys(this.walletAdapters).forEach(async (adapterName) => {
381381
const adapter = this.walletAdapters[adapterName];
382382
if (adapter?.type === ADAPTER_CATEGORY.EXTERNAL) {
383-
log.debug("init external wallet", this.cachedAdapter, adapterName);
383+
log.debug("init external wallet", this.cachedAdapter, adapterName, adapter.status);
384384
this.subscribeToAdapterEvents(adapter);
385385
// we are not initializing cached adapter here as it is already being initialized in initModal before.
386386
if (this.cachedAdapter === adapterName) {
@@ -396,7 +396,8 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
396396
return undefined;
397397
})
398398
.catch((error) => log.error(error, "error while initializing adapter", adapterName));
399-
} else if (adapter.status === ADAPTER_STATUS.READY) {
399+
} else if (adapter.status === ADAPTER_STATUS.READY || adapter.status === ADAPTER_STATUS.CONNECTING) {
400+
// we use connecting status for wallet connect
400401
const adapterModalConfig = (this.modalConfig.adapters as Record<WALLET_ADAPTER_TYPE, ModalConfig>)[adapterName];
401402
adaptersConfig[adapterName] = { ...adapterModalConfig, isInjected: adapter.isInjected };
402403
this.loginModal.addWalletLogins(adaptersConfig, { showExternalWalletsOnly: !!options?.showExternalWalletsOnly });

packages/ui/src/components/ExternalWallet/ExternalWalletInstall.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ export default function ExternalWalletInstall(props: ExternalWalletInstallProps)
111111
// if browser is brave, use chrome extension
112112
const browserType = deviceDetails.browser === "brave" ? "chrome" : deviceDetails.browser;
113113
const browserExtensionConfig = connectButton.walletRegistryItem.app || {};
114-
const browserExtensionId = browserExtensionConfig[browserType];
114+
const extensionForCurrentBrowser =
115+
browserExtensionConfig.browser && browserExtensionConfig.browser.includes(browserType) ? browserExtensionConfig.browser : undefined;
116+
const browserExtensionId = browserExtensionConfig[browserType] || extensionForCurrentBrowser;
115117
const browserExtensionUrl = browserExtensionId ? getBrowserExtensionUrl(browserType, browserExtensionId) : null;
116118
const installLink = browserExtensionUrl ? (
117119
<li key={deviceDetails.browser}>

packages/ui/src/components/ExternalWallets.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ export default function ExternalWallet(props: ExternalWalletsProps) {
5252
const [t] = useTranslation(undefined, { i18n });
5353

5454
const walletDiscoverySupported = useMemo(() => {
55-
const walletConnectSupported = Object.keys(config || {}).some((adapter) => adapter === WALLET_ADAPTERS.WALLET_CONNECT_V2);
56-
const supported = walletRegistry && Object.keys(walletRegistry).length > 0 && walletConnectSupported;
55+
// console.log("config", config);
56+
const supported = walletRegistry && Object.keys(walletRegistry).length > 0;
5757
return supported;
58-
}, [config, walletRegistry]);
58+
}, [walletRegistry]);
5959

6060
const deviceDetails = useMemo<{ platform: platform; os: os; browser: browser }>(() => {
6161
const browser = bowser.getParser(window.navigator.userAgent);
@@ -127,7 +127,7 @@ export default function ExternalWallet(props: ExternalWalletsProps) {
127127
walletRegistryItem,
128128
imgExtension: walletRegistryItem.imgExtension || "svg",
129129
};
130-
130+
// const isBrowserExtensionAvailable = walletRegistryItem.app?.chrome || walletRegistryItem.app?.firefox || walletRegistryItem.app?.edge;
131131
if (!button.hasInjectedWallet && !button.hasWalletConnect && !button.hasInstallLinks) return acc;
132132

133133
const chainNamespaces = new Set(walletRegistryItem.chains?.map((chain) => chain.split(":")[0]));

0 commit comments

Comments
 (0)