From 305f84716d36c3f75d29a044e19fb6573a23d924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Varga-Somogyi=20=C3=81kos?= <vsakos@gmail.com>
Date: Mon, 12 Sep 2022 19:51:36 +0200
Subject: [PATCH] Unified Solflare adapter

---
 packages/use-solana/src/adapters/solflare.ts | 18 ------------------
 packages/use-solana/src/providers.ts         | 18 +-----------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 packages/use-solana/src/adapters/solflare.ts

diff --git a/packages/use-solana/src/adapters/solflare.ts b/packages/use-solana/src/adapters/solflare.ts
deleted file mode 100644
index 4d2fa6d04..000000000
--- a/packages/use-solana/src/adapters/solflare.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { SolletWalletAdapter } from "@solana/wallet-adapter-sollet";
-import type { Transaction } from "@solana/web3.js";
-import invariant from "tiny-invariant";
-
-export class SolflareAdapter extends SolletWalletAdapter {
-  override signAllTransactions = async (
-    txs: Transaction[]
-  ): Promise<Transaction[]> => {
-    const ret = [];
-    for (let i = 0; i < txs.length; i++) {
-      const tx = txs[i];
-      invariant(tx, "tx");
-      const signedTx = await this.signTransaction(tx);
-      ret.push(signedTx);
-    }
-    return ret;
-  };
-}
diff --git a/packages/use-solana/src/providers.ts b/packages/use-solana/src/providers.ts
index 985de4072..2202ad3cd 100644
--- a/packages/use-solana/src/providers.ts
+++ b/packages/use-solana/src/providers.ts
@@ -40,7 +40,6 @@ import type { WalletAdapterBuilder } from "./adapters";
 import { LedgerWalletAdapter, SolanaWalletAdapter } from "./adapters";
 import { ReadonlyAdapter } from "./adapters/readonly";
 import { SecretKeyAdapter } from "./adapters/secret-key";
-import { SolflareAdapter } from "./adapters/solflare";
 
 export enum DefaultWalletType {
   BraveWallet = "BraveWallet",
@@ -58,7 +57,6 @@ export enum DefaultWalletType {
   SecretKey = "SecretKey",
   Slope = "Slope",
   Solflare = "Solflare",
-  SolflareExtension = "SolflareExtension",
   Sollet = "Sollet",
   SolletExtension = "SolletExtension",
   Solong = "Solong",
@@ -186,24 +184,10 @@ export const DEFAULT_WALLET_PROVIDERS: WalletProviderMap<
     makeAdapter: () => new SecretKeyAdapter(),
   },
   [DefaultWalletType.Solflare]: {
-    name: "Solflare (Web)",
-    url: "https://solflare.com/provider",
-    icon: SOLFLARE,
-    makeAdapter: (provider, network) =>
-      new SolanaWalletAdapter(
-        new SolflareAdapter({
-          provider,
-          network: network as WalletAdapterNetwork,
-        })
-      ),
-  },
-  [DefaultWalletType.SolflareExtension]: {
-    name: "Solflare (Extension)",
+    name: "Solflare",
     url: "https://solflare.com/",
     icon: SOLFLARE,
     makeAdapter: () => new SolanaWalletAdapter(new SolflareWalletAdapter()),
-
-    isInstalled: () => window.solflare?.isSolflare === true,
     isMobile: true,
   },
   [DefaultWalletType.Slope]: {