Skip to content

Commit

Permalink
Update package version and format file
Browse files Browse the repository at this point in the history
  • Loading branch information
Adamj1232 committed Nov 14, 2023
1 parent 8a58845 commit 138496e
Showing 1 changed file with 19 additions and 13 deletions.
32 changes: 19 additions & 13 deletions packages/metamask/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import type { MetaMaskSDKOptions } from '@metamask/sdk'
import type { WalletInit } from '@web3-onboard/common'
export type { MetaMaskSDKOptions } from '@metamask/sdk'
import { MetaMaskSDK } from '@metamask/sdk'
import type { MetaMaskSDK } from '@metamask/sdk'
import type { createEIP1193Provider } from '@web3-onboard/common'

type ImportSDK = { createEIP1193Provider: typeof createEIP1193Provider, MetaMaskSDKConstructor: typeof MetaMaskSDK }
type ImportSDK = {
createEIP1193Provider: typeof createEIP1193Provider
MetaMaskSDKConstructor: typeof MetaMaskSDK
}

const loadImports = async () => {
if (importPromise) {
Expand All @@ -13,31 +16,31 @@ const loadImports = async () => {

const { createEIP1193Provider } = await import('@web3-onboard/common')
const importedSDK = await import('@metamask/sdk')
// @ts-ignore
const MetaMaskSDKConstructor = importedSDK.MetaMaskSDK || importedSDK.default.MetaMaskSDK;

const MetaMaskSDKConstructor =
// @ts-ignore
importedSDK.MetaMaskSDK || importedSDK.default.MetaMaskSDK

if (!MetaMaskSDKConstructor) {
throw new Error('Error importing and initializing MetaMask SDK');
throw new Error('Error importing and initializing MetaMask SDK')
}

return { createEIP1193Provider, MetaMaskSDKConstructor }
}

let importPromise: Promise<ImportSDK> | null = null
let sdk: MetaMaskSDK | null = null;
let createInstance: typeof createEIP1193Provider;
let sdk: MetaMaskSDK | null = null
let createInstance: typeof createEIP1193Provider

function metamask({
options
}: {
options: Partial<MetaMaskSDKOptions>
}): WalletInit {

return () => {
importPromise = loadImports().catch((error) => {
importPromise = loadImports().catch(error => {
throw error
});

})

const getProvider = (_sdk: MetaMaskSDK) => {
const provider = createInstance(_sdk.getProvider(), {})
Expand Down Expand Up @@ -67,13 +70,16 @@ function metamask({
// Patch issue with MetaMask SDK, remove after SDK is fixed
localStorage.removeItem('providerType')

if (!imports?.MetaMaskSDKConstructor || !imports?.createEIP1193Provider) {
if (
!imports?.MetaMaskSDKConstructor ||
!imports?.createEIP1193Provider
) {
throw new Error('Error importing and initializing MetaMask SDK')
}

const { createEIP1193Provider, MetaMaskSDKConstructor } = imports

createInstance = createEIP1193Provider;
createInstance = createEIP1193Provider
sdk = new MetaMaskSDKConstructor({
...options,
dappMetadata: {
Expand Down

0 comments on commit 138496e

Please sign in to comment.