fix: remove doubled context providers (#518)

Author: meeh0w

apps/next/src/popup/app.tsx

@@ -139,8 +139,6 @@ export function App() {
             OnboardingScreen={Onboarding}
           />,
           <AccountsContextProvider />,
-          <LedgerContextProvider />,
-          <KeystoneContextProvider />,
           <WalletContextProvider
             LockedComponent={LockScreen}
             LoadingComponent={LoadingScreen}

packages/service-worker/src/connections/middlewares/ExtensionRequestHandlerMiddleware.ts

@@ -95,9 +95,8 @@ const handleRequest = async (
       method: context.request.params.request.method,
       params: context.request.params.request.params,
       context: {
-        currentAddress: context.currentAddress,
-        xpubXP: context.xpubXP,
         ...context.request.context,
+        account: context.account,
       },
     },
     context.network as Network, // TODO: Remove this cast after SVM network type appears in vm-module-types,

packages/service-worker/src/services/wallet/WalletService.ts

@@ -793,11 +793,15 @@ export class WalletService implements OnUnlock {
 
     // Handle Avalanche transaction requests coming from the Avalanche Module
     if (isAvalancheModuleTransactionRequest(tx)) {
+      const isLedgerSigner =
+        wallet instanceof Avalanche.SimpleLedgerSigner ||
+        wallet instanceof Avalanche.LedgerSigner ||
+        wallet instanceof Avalanche.LedgerLiveSigner;
+
       if (
+        !isLedgerSigner &&
         !(wallet instanceof Avalanche.SimpleSigner) &&
         !(wallet instanceof Avalanche.StaticSigner) &&
-        !(wallet instanceof Avalanche.SimpleLedgerSigner) &&
-        !(wallet instanceof Avalanche.LedgerSigner) &&
         !(wallet instanceof KeystoneWallet) &&
         !(wallet instanceof WalletConnectSigner) &&
         !(wallet instanceof SeedlessWallet)
@@ -832,8 +836,7 @@ export class WalletService implements OnUnlock {
 
       const signRequest = {
         tx: unsignedTx,
-        ...((wallet instanceof Avalanche.SimpleLedgerSigner ||
-          wallet instanceof Avalanche.LedgerSigner) && {
+        ...(isLedgerSigner && {
           transport: this.ledgerService.recentTransport,
         }),
         externalIndices,
@@ -870,12 +873,15 @@ export class WalletService implements OnUnlock {
 
     // Handle Avalanche signing, X/P/CoreEth
     if ('tx' in tx) {
+      const isLedgerSigner =
+        wallet instanceof Avalanche.LedgerSigner ||
+        wallet instanceof Avalanche.LedgerLiveSigner ||
+        wallet instanceof Avalanche.SimpleLedgerSigner;
+
       if (
+        !isLedgerSigner &&
         !(wallet instanceof Avalanche.SimpleSigner) &&
         !(wallet instanceof Avalanche.StaticSigner) &&
-        !(wallet instanceof Avalanche.SimpleLedgerSigner) &&
-        !(wallet instanceof Avalanche.LedgerSigner) &&
-        !(wallet instanceof Avalanche.LedgerLiveSigner) &&
         !(wallet instanceof KeystoneWallet) &&
         !(wallet instanceof WalletConnectSigner) &&
         !(wallet instanceof SeedlessWallet)
@@ -885,9 +891,7 @@ export class WalletService implements OnUnlock {
 
       const txToSign = {
         tx: tx.tx,
-        ...((wallet instanceof Avalanche.SimpleLedgerSigner ||
-          wallet instanceof Avalanche.LedgerSigner ||
-          wallet instanceof Avalanche.LedgerLiveSigner) && {
+        ...(isLedgerSigner && {
           transport: this.ledgerService.recentTransport,
         }),
         externalIndices: tx.externalIndices,