Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: display accounts after users add Astar and Polkadot Snap #949

Merged
merged 1 commit into from
Oct 3, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/components/header/modals/ModalConnectWallet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,22 @@
<script lang="ts">
import { wait } from '@astar-network/astar-sdk-core';
import { initPolkadotSnap } from '@chainsafe/metamask-polkadot-adapter';
import { get } from 'lodash-es';
import { $api } from 'src/boot/api';
import { endpointKey } from 'src/config/chainEndpoints';
import {
SupportMultisig,
SupportWallet,
Wallet,
supportAllWalletsObj,
supportEvmWalletObj,
supportEvmWallets,
supportWallets,
} from 'src/config/wallets';
import { useAccount, useNetworkInfo } from 'src/hooks';
import { initiatePolkdatodSnap } from 'src/modules/snap';
import { getInjectedExtensions, isMobileDevice } from 'src/hooks/helper/wallet';
import { useExtensions } from 'src/hooks/useExtensions';
import { initiatePolkdatodSnap } from 'src/modules/snap';
import { useStore } from 'src/store';
import { SubstrateAccount } from 'src/store/general/state';
import { PropType, computed, defineComponent, ref } from 'vue';
Expand Down Expand Up @@ -240,14 +242,23 @@ export default defineComponent({
}
};

const handleMetaMaskSnap = async (): Promise<void> => {
const provider = get(window, supportEvmWalletObj[SupportWallet.MetaMask].ethExtension);
const [address] = (await provider.request({ method: 'eth_requestAccounts' })) as string;
if (!address) return;
const isSnapInstalled = await initiatePolkdatodSnap();
if (isSnapInstalled) {
await initPolkadotSnap();
useExtensions($api!!, store);
const extensions = await getInjectedExtensions(true);
const isExtensionsUpdated = extensions.some((it) => it.name === SupportWallet.Snap);
// Memo: Sync the metamask extension for users who visit our portal first time
!isExtensionsUpdated && (await wait(3000));
}
};
const setSubstrateWalletModal = async (source: string): Promise<void> => {
if (source === SupportWallet.Snap) {
const isSnapInstalled = await initiatePolkdatodSnap();
if (isSnapInstalled) {
await initPolkadotSnap();
useExtensions($api!!, store);
await getInjectedExtensions(true);
}
await handleMetaMaskSnap();
}
await closeModal();
props.setWalletModal(source);
Expand Down
Loading