Update some typo and removed walletConnection[coinbase and wallerConn…

…ect2]
DoraFactory · Sep 18, 2024 · 7b391b8 · 7b391b8
1 parent 43201bb
commit 7b391b8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 92 deletions.
diff --git a/src/constants/account.ts b/src/constants/account.ts
@@ -2,7 +2,7 @@
  * OnboardingSteps
  * 1. Choose wallet
  * 2. Key derivation
- *  a. If wallet has no dYdX Chain transactions and not on whitelist, sign twice (future)
+ *  a. If wallet has no Vota Chain transactions and not on whitelist, sign twice (future)
  *   i. Success
  *   ii. Signatures don't match error (Wallet is non-deterministic)
  *  b. Success

diff --git a/src/constants/localStorage.ts b/src/constants/localStorage.ts
@@ -1,14 +1,14 @@
 export enum LocalStorageKey {
   // Onboarding / Accounts
-  EvmAddress = 'dydx.migrate.EvmAddress',
-  DoraAddress = 'dydx.migrate.DoraAddress',
-  OnboardingSelectedWalletType = 'dydx.migrate.OnboardingSelectedWalletType',
-  WalletConnectionType = 'dydx.migrate.WalletConnectionType',
-  OnboardingHasAcknowledgedTerms = 'dydx.migrate.OnboardingHasAcknowledgedTerms',
-  EvmDerivedAddresses = 'dydx.migrate.EvmDerivedAddresses',
+  EvmAddress = 'dora.migrate.EvmAddress',
+  DoraAddress = 'dora.migrate.DoraAddress',
+  OnboardingSelectedWalletType = 'dora.migrate.OnboardingSelectedWalletType',
+  WalletConnectionType = 'dora.migrate.WalletConnectionType',
+  OnboardingHasAcknowledgedTerms = 'dora.migrate.OnboardingHasAcknowledgedTerms',
+  EvmDerivedAddresses = 'dora.migrate.EvmDerivedAddresses',
 
   // UI State
-  SelectedLocale = 'dydx.migrate.SelectedLocale',
+  SelectedLocale = 'dora.migrate.SelectedLocale',
 }
 
 export const LOCAL_STORAGE_VERSIONS = {

diff --git a/src/constants/wallets.ts b/src/constants/wallets.ts
@@ -9,9 +9,7 @@ import { isMetaMask } from '@/lib/wallet/providers';
 // Wallet connection types
 
 export enum WalletConnectionType {
-  CoinbaseWalletSdk = 'coinbaseWalletSdk',
   InjectedEip1193 = 'injectedEip1193',
-  WalletConnect2 = 'walletConnect2',
 }
 
 export enum WalletErrorType {
@@ -32,33 +30,21 @@ type WalletConnectionTypeConfig = {
 };
 
 export const walletConnectionTypes: Record<WalletConnectionType, WalletConnectionTypeConfig> = {
-  [WalletConnectionType.CoinbaseWalletSdk]: {
-    name: 'Coinbase Wallet SDK',
-    wagmiConnectorId: 'coinbaseWallet',
-  },
   [WalletConnectionType.InjectedEip1193]: {
     name: 'injected EIP-1193 provider',
     wagmiConnectorId: 'injected',
   },
-  [WalletConnectionType.WalletConnect2]: {
-    name: 'WalletConnect 2.0',
-    wagmiConnectorId: 'walletConnect',
-  },
 };
 
 // Wallets
 
 export enum WalletType {
-  CoinbaseWallet = 'COINBASE_WALLET',
   MetaMask = 'METAMASK',
-  WalletConnect2 = 'WALLETCONNECT_2',
   OtherWallet = 'OTHER_WALLET',
 }
 
 export const DISPLAYED_WALLETS: WalletType[] = [
   WalletType.MetaMask,
-  WalletType.WalletConnect2,
-  WalletType.CoinbaseWallet,
   WalletType.OtherWallet,
 ];
 
@@ -94,7 +80,7 @@ export const wallets: Record<WalletType, WalletConfig> = {
     type: WalletType.OtherWallet,
     stringKey: "Other",
     icon: GenericWalletIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
+    connectionTypes: [WalletConnectionType.InjectedEip1193],
     matchesInjectedEip1193: (provider) =>
       Object.entries(wallets).every(
         ([walletType, walletConfig]) =>
@@ -103,27 +89,14 @@ export const wallets: Record<WalletType, WalletConfig> = {
           !walletConfig.matchesInjectedEip1193(provider)
       ),
   },
-  [WalletType.CoinbaseWallet]: {
-    type: WalletType.CoinbaseWallet,
-    stringKey: "Coinbase Wallet",
-    icon: CoinbaseIcon,
-    connectionTypes: [WalletConnectionType.CoinbaseWalletSdk, WalletConnectionType.InjectedEip1193],
-    matchesInjectedEip1193: (provider) => provider.isCoinbaseWallet,
-  },
   [WalletType.MetaMask]: {
     type: WalletType.MetaMask,
     stringKey: "MetaMask",
     icon: MetaMaskIcon,
-    connectionTypes: [WalletConnectionType.InjectedEip1193, WalletConnectionType.WalletConnect2],
+    connectionTypes: [WalletConnectionType.InjectedEip1193],
     matchesInjectedEip1193: isMetaMask,
     walletconnect2Id: WALLET_CONNECT_EXPLORER_RECOMMENDED_WALLETS.Metamask,
   },
-  [WalletType.WalletConnect2]: {
-    type: WalletType.WalletConnect2,
-    stringKey: "WalletConnect",
-    icon: WalletConnectIcon,
-    connectionTypes: [WalletConnectionType.WalletConnect2],
-  },
 };
 
 // Injected EIP-1193 Providers
@@ -155,22 +128,22 @@ export type WalletConnection = {
   provider?: ExternalProvider;
 };
 
-// dYdX Chain wallets
+// Chain wallets
 
 import { type onboarding } from '@dydxprotocol/v4-client-js';
 
 export const COSMOS_DERIVATION_PATH = "m/44'/118'/0'/0/0";
 
 /**
- * @description typed data to sign for dYdX Chain onboarding
+ * @description typed data to sign for Dora Vota Chain onboarding
  */
 export const SIGN_TYPED_DATA = {
-  primaryType: 'dYdx',
+  primaryType: 'DORA',
   domain: {
     name: 'Dora Vota',
   },
   types: {
-    dYdx: [{ name: 'action', type: 'string' }],
+    DORA: [{ name: 'action', type: 'string' }],
   },
   message: {
     action: 'DORA Token Migration Onboarding',

diff --git a/src/lib/wagmi.ts b/src/lib/wagmi.ts
@@ -38,27 +38,6 @@ const injectedConnectorOptions = {
   },
 };
 
-const walletconnect2ConnectorOptions: ConstructorParameters<typeof WalletConnectConnector>[0] = {
-  chains,
-  options: {
-    projectId: import.meta.env.VITE_WALLETCONNECT2_PROJECT_ID,
-    metadata: {
-      name: 'dYdX',
-      description: '',
-      url: import.meta.env.VITE_BASE_URL,
-      icons: [`${import.meta.env.VITE_BASE_URL}/cbw-image.png}`],
-    },
-    showQrModal: true,
-    qrModalOptions: {
-      themeMode: 'dark' as const,
-      themeVariables: {
-        '--wcm-accent-color': '#5973fe',
-        '--wcm-font-family': 'var(--fontFamily-base)',
-      },
-      explorerRecommendedWalletIds: WALLET_CONNECT_EXPLORER_RECOMMENDED_IDS,
-    },
-  },
-};
 
 const connectors = [
   new MetaMaskConnector({
@@ -67,14 +46,6 @@ const connectors = [
       shimDisconnect: true,
     },
   }),
-  new CoinbaseWalletConnector({
-    chains,
-    options: {
-      appName: 'dYdX',
-      reloadOnDisconnect: false,
-    },
-  }),
-  new WalletConnectConnector(walletconnect2ConnectorOptions),
   new InjectedConnector(injectedConnectorOptions),
 ];
 
@@ -96,18 +67,6 @@ const createInjectedConnectorWithProvider = (provider: ExternalProvider) =>
       provider as unknown as Awaited<ReturnType<InjectedConnector['getProvider']>>;
   })(injectedConnectorOptions) as InjectedConnector;
 
-const createWalletConnect2ConnectorWithId = (walletconnect2Id: string) =>
-  new WalletConnectConnector({
-    ...walletconnect2ConnectorOptions,
-    options: {
-      ...walletconnect2ConnectorOptions.options,
-      qrModalOptions: {
-        ...walletconnect2ConnectorOptions.options.qrModalOptions,
-        explorerRecommendedWalletIds: [walletconnect2Id],
-        explorerExcludedWalletIds: 'ALL',
-      },
-    },
-  });
 
 // Custom connector from wallet selection
 import {
@@ -131,7 +90,5 @@ export const resolveWagmiConnector = ({
 
   return walletConnection.type === WalletConnectionType.InjectedEip1193 && walletConnection.provider
     ? createInjectedConnectorWithProvider(walletConnection.provider)
-    : walletConnection.type === WalletConnectionType.WalletConnect2 && walletConfig.walletconnect2Id
-    ? createWalletConnect2ConnectorWithId(walletConfig.walletconnect2Id)
     : connectors.find(({ id }: { id: string }) => id === walletConnectionConfig.wagmiConnectorId);
 };
diff --git a/src/views/dialogs/OnboardingDialog/ChooseWallet.tsx b/src/views/dialogs/OnboardingDialog/ChooseWallet.tsx
@@ -15,8 +15,6 @@ import { Button } from '@/components/Button';
 import { Icon } from '@/components/Icon';
 import { Link } from '@/components/Link';
 
-const aboutWalletsLink = `https://www.dydx.academy/video/defi-wallet`;
-
 export const ChooseWallet = () => {
   const stringGetter = useStringGetter();
 
@@ -48,12 +46,6 @@ export const ChooseWallet = () => {
           </Styled.WalletButton>
         ))}
       </Styled.Wallets>
-
-      <Styled.Footer>
-        <Link href={aboutWalletsLink} withIcon>
-          About wallets
-        </Link>
-      </Styled.Footer>
     </>
   );
 };