Merge pull request #107 from lidofinance/feature/adapters-xdefi-imtok…

…en-trust Add Wallet Adapters for XDEFI, imToken, Trust
lidofinance · Dec 6, 2023 · cc9d296 · cc9d296
2 parents e6cbbab + acbcd75
commit cc9d296
Show file tree

Hide file tree

Showing 50 changed files with 539 additions and 601 deletions.
diff --git a/packages/connect-wallet-modal/CHANGELOG.md b/packages/connect-wallet-modal/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @reef-knot/connect-wallet-modal
 
+## 1.12.0
+
+### Minor Changes
+
+- Rework XDEFI, Trust, imToken to use Wallet Adapters and wagmi
+
 ## 1.11.1
 
 ### Patch Changes

diff --git a/packages/connect-wallet-modal/package.json b/packages/connect-wallet-modal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/connect-wallet-modal",
-  "version": "1.11.1",
+  "version": "1.12.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -49,8 +49,8 @@
     "@reef-knot/types": "^1.3.0",
     "@reef-knot/ui-react": "^1.0.7",
     "@reef-knot/wallets-helpers": "^1.1.5",
-    "@reef-knot/wallets-icons": "^1.3.0",
-    "@reef-knot/web3-react": "^1.9.0",
+    "@reef-knot/wallets-icons": "^1.4.0",
+    "@reef-knot/web3-react": "^1.10.0",
     "@reef-knot/ledger-connector": "^1.1.0",
     "@types/ua-parser-js": "^0.7.36",
     "eslint-config-custom": "*",

diff --git a/packages/connect-wallet-modal/src/components/WalletsModalForEth/WalletsModalForEth.tsx b/packages/connect-wallet-modal/src/components/WalletsModalForEth/WalletsModalForEth.tsx
@@ -1,16 +1,12 @@
 import React from 'react';
-import { helpers } from '@reef-knot/web3-react';
 import { useReefKnotContext } from '@reef-knot/core-react';
 import { WalletAdapterData } from '@reef-knot/types';
 import {
   ConnectCoinbase,
-  ConnectImToken,
   ConnectInjected,
   ConnectLedger,
   ConnectMetamask,
-  ConnectTrust,
   ConnectWC,
-  ConnectXdefi,
 } from '../../connectButtons';
 import { ButtonsCommonProps, WalletsModal } from '../WalletsModal';
 import { WalletsModalForEthProps } from './types';
@@ -23,9 +19,6 @@ const walletsButtons: { [K in WalletId | string]: React.ComponentType } = {
   [WALLET_IDS.METAMASK]: ConnectMetamask,
   [WALLET_IDS.LEDGER]: ConnectLedger,
   [WALLET_IDS.COINBASE]: ConnectCoinbase,
-  [WALLET_IDS.TRUST]: ConnectTrust,
-  [WALLET_IDS.IM_TOKEN]: ConnectImToken,
-  [WALLET_IDS.XDEFI]: ConnectXdefi,
 };
 
 function getWalletButton(
@@ -61,26 +54,15 @@ function getWalletsButtons(
 ) {
   let wallets: WalletId[] = [WALLET_IDS.METAMASK];
 
-  // Adding wallets using a new wallet adapter API
-  // TODO: migrate all wallets to use wallet adapter API
   walletDataList.forEach((walletData) => {
     const { walletId, detector } = walletData;
     addWalletTo(wallets, walletId, !!detector?.());
   });
 
-  wallets = [
-    ...wallets,
-    WALLET_IDS.LEDGER,
-    WALLET_IDS.COINBASE,
-    WALLET_IDS.TRUST,
-    WALLET_IDS.IM_TOKEN,
-  ];
-
-  // Deprecated way of adding wallets with additional detection
-  addWalletTo(wallets, WALLET_IDS.XDEFI, helpers.isXdefiProvider());
-
-  // Filtering wallets marked as hidden
-  wallets = wallets.filter((wallet) => !hiddenWallets.includes(wallet));
+  wallets = [...wallets, WALLET_IDS.LEDGER, WALLET_IDS.COINBASE].filter(
+    // Filtering wallets marked as hidden
+    (wallet) => !hiddenWallets.includes(wallet),
+  );
 
   return wallets.map((walletId) => {
     // Handle new wallet adapters

diff --git a/packages/connect-wallet-modal/src/connectButtons/connectImToken.tsx b/packages/connect-wallet-modal/src/connectButtons/connectImToken.tsx
diff --git a/packages/connect-wallet-modal/src/connectButtons/connectTrust.tsx b/packages/connect-wallet-modal/src/connectButtons/connectTrust.tsx
diff --git a/packages/connect-wallet-modal/src/connectButtons/connectXdefi.tsx b/packages/connect-wallet-modal/src/connectButtons/connectXdefi.tsx
diff --git a/packages/connect-wallet-modal/src/connectButtons/index.ts b/packages/connect-wallet-modal/src/connectButtons/index.ts
@@ -1,8 +1,5 @@
 export { default as ConnectCoinbase } from './connectCoinbase';
-export { default as ConnectImToken } from './connectImToken';
 export { default as ConnectLedger } from './connectLedger';
 export { default as ConnectMetamask } from './connectMetamask';
-export { default as ConnectTrust } from './connectTrust';
-export { default as ConnectXdefi } from './connectXdefi';
 export * from './ConnectInjected';
 export * from './ConnectWC';
diff --git a/packages/connect-wallet-modal/src/constants/wallets.ts b/packages/connect-wallet-modal/src/constants/wallets.ts
@@ -2,10 +2,6 @@ export const WALLET_IDS = {
   METAMASK: 'Metamask',
   LEDGER: 'Ledger',
   COINBASE: 'Coinbase',
-  TRUST: 'Trust',
-  IM_TOKEN: 'ImToken',
-  COIN98: 'Coin98',
-  XDEFI: 'Xdefi',
 } as const;
 
 export type WalletId = (typeof WALLET_IDS)[keyof typeof WALLET_IDS] | string;
diff --git a/packages/reef-knot/CHANGELOG.md b/packages/reef-knot/CHANGELOG.md
@@ -1,5 +1,15 @@
 # reef-knot
 
+## 1.12.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @reef-knot/connect-wallet-modal@1.12.0
+  - @reef-knot/wallets-list@1.8.0
+  - @reef-knot/web3-react@1.10.0
+  - @reef-knot/wallets-icons@1.4.0
+
 ## 1.11.2
 
 ### Patch Changes

diff --git a/packages/reef-knot/package.json b/packages/reef-knot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reef-knot",
-  "version": "1.11.2",
+  "version": "1.12.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -41,12 +41,12 @@
     "lint": "eslint --ext ts,tsx,js,mjs ."
   },
   "dependencies": {
-    "@reef-knot/connect-wallet-modal": "1.11.1",
+    "@reef-knot/connect-wallet-modal": "1.12.0",
     "@reef-knot/core-react": "1.7.0",
-    "@reef-knot/web3-react": "1.9.1",
+    "@reef-knot/web3-react": "1.10.0",
     "@reef-knot/ui-react": "1.0.7",
-    "@reef-knot/wallets-icons": "1.3.0",
-    "@reef-knot/wallets-list": "1.7.1",
+    "@reef-knot/wallets-icons": "1.4.0",
+    "@reef-knot/wallets-list": "1.8.0",
     "@reef-knot/wallets-helpers": "1.1.5",
     "@reef-knot/types": "1.3.0",
     "@reef-knot/ledger-connector": "1.1.1"

diff --git a/packages/wallets-icons/CHANGELOG.md b/packages/wallets-icons/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @reef-knot/wallets-icons
 
+## 1.4.0
+
+### Minor Changes
+
+- Remove XDEFI, Trust, imToken icons
+
 ## 1.3.0
 
 ### Minor Changes

diff --git a/packages/wallets-icons/package.json b/packages/wallets-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/wallets-icons",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {

diff --git a/packages/wallets-icons/src/react/index.ts b/packages/wallets-icons/src/react/index.ts
@@ -1,5 +1,4 @@
 export { default as Coinbase } from '../svg/coinbase.svg';
-export { default as ImToken } from '../svg/imtoken.svg';
 export { default as Ledger } from '../svg/ledger.svg';
 export { default as LedgerInversion } from '../svg/ledger-inversion.svg';
 export { default as LedgerConfirm } from '../svg/ledger-confirm.svg';
@@ -9,5 +8,3 @@ export { default as LedgerSuccess } from '../svg/ledger-success.svg';
 export { default as MetaMask } from '../svg/metamask.svg';
 export { default as MetaMaskCircle } from '../svg/metamask-circle.svg';
 export { default as MetaMaskCircleInversion } from '../svg/metamask-circle-inversion.svg';
-export { default as Trust } from '../svg/trust-circle.svg';
-export { default as XDEFI } from '../svg/xdefi-wallet.svg';
diff --git a/packages/wallets-list/CHANGELOG.md b/packages/wallets-list/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @reef-knot/wallets-list
 
+## 1.8.0
+
+### Minor Changes
+
+- Rework XDEFI, Trust, imToken to use Wallet Adapters and wagmi
+
 ## 1.7.1
 
 ### Patch Changes

diff --git a/packages/wallets-list/package.json b/packages/wallets-list/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/wallets-list",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -48,7 +48,10 @@
     "@reef-knot/wallet-adapter-ambire": "1.2.4",
     "@reef-knot/wallet-adapter-bitkeep": "1.1.1",
     "@reef-knot/wallet-adapter-coin98": "1.0.1",
-    "@reef-knot/wallet-adapter-brave": "1.0.1"
+    "@reef-knot/wallet-adapter-brave": "1.0.1",
+    "@reef-knot/wallet-adapter-imtoken": "1.0.0",
+    "@reef-knot/wallet-adapter-trust": "1.0.0",
+    "@reef-knot/wallet-adapter-xdefi": "1.0.0"
   },
   "devDependencies": {
     "@reef-knot/types": "^1.3.0",

diff --git a/packages/wallets-list/src/ethereum.ts b/packages/wallets-list/src/ethereum.ts
@@ -6,6 +6,9 @@ import { Ambire } from '@reef-knot/wallet-adapter-ambire';
 import { BitKeep } from '@reef-knot/wallet-adapter-bitkeep';
 import { Coin98 } from '@reef-knot/wallet-adapter-coin98';
 import { Brave } from '@reef-knot/wallet-adapter-brave';
+import { ImToken } from '@reef-knot/wallet-adapter-imtoken';
+import { Trust } from '@reef-knot/wallet-adapter-trust';
+import { Xdefi } from '@reef-knot/wallet-adapter-xdefi';
 
 export const WalletsListEthereum: WalletsListType = {
   okx: Okx,
@@ -15,4 +18,7 @@ export const WalletsListEthereum: WalletsListType = {
   bitkeep: BitKeep,
   coin98: Coin98,
   brave: Brave,
+  imtoken: ImToken,
+  trust: Trust,
+  xdefi: Xdefi,
 };