diff --git a/demo/vue-app/src/lib/sol.ts b/demo/vue-app/src/lib/sol.ts index b0a1f15ca..6ca6fe70d 100644 --- a/demo/vue-app/src/lib/sol.ts +++ b/demo/vue-app/src/lib/sol.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Connection, LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transaction } from "@solana/web3.js"; -import { CustomChainConfig, SafeEventEmitterProvider } from "@web3auth/base"; +import { CustomChainConfig, IProvider } from "@web3auth/base"; import { SolanaWallet } from "@web3auth/solana-provider"; -const getConnection = async (provider: SafeEventEmitterProvider): Promise => { +const getConnection = async (provider: IProvider): Promise => { const solanaWallet = new SolanaWallet(provider); const connectionConfig = await solanaWallet.request({ method: "solana_provider_config" }); @@ -19,7 +19,7 @@ function getNewTx(publicKeys, blockhash) { return new Transaction({ recentBlockhash: blockhash, feePayer: new PublicKey(publicKeys![0]) }).add(inst); } -export const getAccounts = async (provider: SafeEventEmitterProvider, uiConsole: any): Promise => { +export const getAccounts = async (provider: IProvider, uiConsole: any): Promise => { try { const solWeb3 = new SolanaWallet(provider); const acc = await solWeb3.requestAccounts(); @@ -30,7 +30,7 @@ export const getAccounts = async (provider: SafeEventEmitterProvider, uiConsole: uiConsole("error", error); } }; -export const getBalance = async (provider: SafeEventEmitterProvider, uiConsole: any): Promise => { +export const getBalance = async (provider: IProvider, uiConsole: any): Promise => { try { const conn = await getConnection(provider); const solanaWallet = new SolanaWallet(provider); @@ -44,7 +44,7 @@ export const getBalance = async (provider: SafeEventEmitterProvider, uiConsole: } }; -export const signAndSendTransaction = async (provider: SafeEventEmitterProvider, uiConsole: any) => { +export const signAndSendTransaction = async (provider: IProvider, uiConsole: any) => { try { const conn = await getConnection(provider); const solWeb3 = new SolanaWallet(provider); @@ -71,7 +71,7 @@ export const signAndSendTransaction = async (provider: SafeEventEmitterProvider, } }; -export const signTransaction = async (provider: SafeEventEmitterProvider, uiConsole: any) => { +export const signTransaction = async (provider: IProvider, uiConsole: any) => { try { const conn = await getConnection(provider); const solWeb3 = new SolanaWallet(provider); @@ -101,7 +101,7 @@ export const signTransaction = async (provider: SafeEventEmitterProvider, uiCons } }; -export const signMessage = async (provider: SafeEventEmitterProvider, uiConsole: any) => { +export const signMessage = async (provider: IProvider, uiConsole: any) => { try { const solWeb3 = new SolanaWallet(provider); const msg = Buffer.from("Test Signing Message ", "utf8"); @@ -113,7 +113,7 @@ export const signMessage = async (provider: SafeEventEmitterProvider, uiConsole: } }; -export const signAllTransactions = async (provider: SafeEventEmitterProvider, uiConsole: any) => { +export const signAllTransactions = async (provider: IProvider, uiConsole: any) => { try { const conn = await getConnection(provider); const solWeb3 = new SolanaWallet(provider); diff --git a/demo/vue-app/src/whitelabel/whitelabel.vue b/demo/vue-app/src/whitelabel/whitelabel.vue index 09e5b39b9..5b0e67637 100644 --- a/demo/vue-app/src/whitelabel/whitelabel.vue +++ b/demo/vue-app/src/whitelabel/whitelabel.vue @@ -77,7 +77,8 @@ export default defineComponent({ this.loading = true; this.web3auth = new Web3Auth({ uiConfig: { - appLogo: this.uiConfig.logoUrl, + logoLight: this.uiConfig.logoUrl, + logoDark: this.uiConfig.logoUrl, theme: this.uiConfig.theme, loginMethodsOrder: this.uiConfig.loginMethodsOrder, defaultLanguage: this.uiConfig.defaultLanguage, diff --git a/packages/adapters/torus-evm-adapter/src/torusWalletAdapter.ts b/packages/adapters/torus-evm-adapter/src/torusWalletAdapter.ts index a4b4ae559..a5c79e1b3 100644 --- a/packages/adapters/torus-evm-adapter/src/torusWalletAdapter.ts +++ b/packages/adapters/torus-evm-adapter/src/torusWalletAdapter.ts @@ -110,7 +110,7 @@ export class TorusWalletAdapter extends BaseEvmAdapter { this.emit(ADAPTER_EVENTS.CONNECTING, { adapter: WALLET_ADAPTERS.TORUS_EVM }); try { await this.torusInstance.login(this.loginSettings); - const { chainId } = this.torusInstance.provider; + const chainId = await this.torusInstance.provider.request({ method: "eth_chainId" }); if (chainId && parseInt(chainId) !== parseInt((this.chainConfig as CustomChainConfig).chainId, 16)) { const { chainId: _chainId, blockExplorer, displayName, rpcTarget, ticker, tickerName } = this.chainConfig as CustomChainConfig; const network: NetworkInterface = {