chore: moved connector constants to common package

ignaciosantise · ignaciosantise · commit e696bf88186c · 2025-02-10T14:09:40.000-03:00
diff --git a/packages/auth-ethers/package.json b/packages/auth-ethers/package.json
@@ -36,6 +36,7 @@
     "access": "public"
   },
   "dependencies": {
+    "@reown/appkit-common-react-native": "1.2.1",
     "@reown/appkit-wallet-react-native": "1.2.1"
   },
   "peerDependencies": {
diff --git a/packages/auth-ethers/src/index.ts b/packages/auth-ethers/src/index.ts
@@ -1,13 +1,13 @@
 import { AppKitFrameProvider, type AppKitFrameTypes } from '@reown/appkit-wallet-react-native';
-
+import { ConstantsUtil, PresetsUtil } from '@reown/appkit-common-react-native';
 interface AuthProviderProps {
   projectId: string;
   metadata: AppKitFrameTypes.Metadata;
 }
 
 export class AuthProvider extends AppKitFrameProvider {
-  readonly id = 'appKitAuth';
-  readonly name = 'AppKit Universal Wallet';
+  readonly id = ConstantsUtil.AUTH_CONNECTOR_ID;
+  readonly name = PresetsUtil.ConnectorNamesMap[ConstantsUtil.AUTH_CONNECTOR_ID]!;
 
   constructor(props: AuthProviderProps) {
     super(props.projectId, props.metadata);
diff --git a/packages/auth-wagmi/package.json b/packages/auth-wagmi/package.json
@@ -36,6 +36,7 @@
     "access": "public"
   },
   "dependencies": {
+    "@reown/appkit-common-react-native": "1.2.1",
     "@reown/appkit-core-react-native": "1.2.1",
     "@reown/appkit-wallet-react-native": "1.2.1"
   },
diff --git a/packages/auth-wagmi/src/index.ts b/packages/auth-wagmi/src/index.ts
@@ -3,6 +3,7 @@ import { SwitchChainError, getAddress, type Address, type Hex } from 'viem';
 
 import { AppKitFrameProvider } from '@reown/appkit-wallet-react-native';
 import { StorageUtil } from '@reown/appkit-core-react-native';
+import { ConstantsUtil, PresetsUtil } from '@reown/appkit-common-react-native';
 
 export type Metadata = {
   name: string;
@@ -26,16 +27,16 @@ type StorageItemMap = {
   recentConnectorId?: string;
 };
 
-authConnector.type = 'appKitAuth' as const;
-authConnector.id = 'appKitAuth' as const;
+authConnector.type = PresetsUtil.ConnectorTypesMap[ConstantsUtil.AUTH_CONNECTOR_ID]!;
+authConnector.id = ConstantsUtil.AUTH_CONNECTOR_ID;
 export function authConnector(parameters: AuthConnectorOptions) {
   let _provider: AppKitFrameProvider = {} as AppKitFrameProvider;
   let _currentAddress: Address | null = null;
   let _chainId: number | null = null;
 
   return createConnector<Provider, {}, StorageItemMap>(config => ({
     id: authConnector.id,
-    name: 'AppKit Universal Wallet',
+    name: PresetsUtil.ConnectorNamesMap[ConstantsUtil.AUTH_CONNECTOR_ID]!,
     type: authConnector.type,
     async setup() {
       _provider = new AppKitFrameProvider(parameters.projectId, parameters.metadata);
diff --git a/packages/coinbase-ethers/package.json b/packages/coinbase-ethers/package.json
@@ -36,6 +36,9 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
+  "dependencies": {
+    "@reown/appkit-common-react-native": "1.2.1"
+  },
   "peerDependencies": {
     "@coinbase/wallet-mobile-sdk": ">=1.0.10",
     "ethers": ">=5"
diff --git a/packages/coinbase-ethers/src/index.ts b/packages/coinbase-ethers/src/index.ts
@@ -1,5 +1,6 @@
 import { configure, WalletMobileSDKEVMProvider } from '@coinbase/wallet-mobile-sdk';
 import type { WalletMobileSDKProviderOptions } from '@coinbase/wallet-mobile-sdk/build/WalletMobileSDKEVMProvider';
+import { ConstantsUtil, PresetsUtil } from '@reown/appkit-common-react-native';
 
 interface RequestArguments {
   readonly method: string;
@@ -12,8 +13,8 @@ type CoinbaseProviderOptions = WalletMobileSDKProviderOptions & {
 };
 
 export class CoinbaseProvider {
-  readonly id = 'coinbaseWallet';
-  readonly name = 'Coinbase Wallet';
+  readonly id = ConstantsUtil.COINBASE_CONNECTOR_ID;
+  readonly name = PresetsUtil.ConnectorNamesMap[ConstantsUtil.COINBASE_CONNECTOR_ID]!;
 
   private _provider?: WalletMobileSDKEVMProvider;
   private _initProviderPromise?: Promise<void>;
diff --git a/packages/coinbase-wagmi/package.json b/packages/coinbase-wagmi/package.json
@@ -36,6 +36,9 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
+  "dependencies": {
+    "@reown/appkit-common-react-native": "1.2.1"
+  },
   "peerDependencies": {
     "@coinbase/wallet-mobile-sdk": ">=1.0.10",
     "wagmi": ">=2"
diff --git a/packages/coinbase-wagmi/src/index.ts b/packages/coinbase-wagmi/src/index.ts
@@ -8,20 +8,21 @@ import {
 } from 'viem';
 import { WalletMobileSDKEVMProvider, configure } from '@coinbase/wallet-mobile-sdk';
 import type { WalletMobileSDKProviderOptions } from '@coinbase/wallet-mobile-sdk/build/WalletMobileSDKEVMProvider';
+import { ConstantsUtil, PresetsUtil } from '@reown/appkit-common-react-native';
 
 type CoinbaseConnectorParameters = WalletMobileSDKProviderOptions & {
   redirect: string;
 };
 
 type Provider = WalletMobileSDKEVMProvider;
 
-coinbaseConnector.type = 'coinbaseWallet' as const;
+coinbaseConnector.type = PresetsUtil.ConnectorTypesMap[ConstantsUtil.COINBASE_CONNECTOR_ID]!;
 export function coinbaseConnector(parameters: CoinbaseConnectorParameters) {
   let _provider: Provider;
 
   return createConnector<Provider>(config => ({
-    id: 'coinbaseWallet',
-    name: 'Coinbase Wallet',
+    id: ConstantsUtil.COINBASE_CONNECTOR_ID,
+    name: PresetsUtil.ConnectorNamesMap[ConstantsUtil.COINBASE_CONNECTOR_ID]!,
     type: coinbaseConnector.type,
     async connect({ chainId } = {}) {
       try {
diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
@@ -4,6 +4,7 @@ export { DateUtil } from './utils/DateUtil';
 export { NamesUtil } from './utils/NamesUtil';
 export { NetworkUtil } from './utils/NetworkUtil';
 export { NumberUtil } from './utils/NumberUtil';
+export { PresetsUtil } from './utils/PresetsUtil';
 export { StringUtil } from './utils/StringUtil';
 export { ErrorUtil } from './utils/ErrorUtil';
 export { erc20ABI } from './contracts/erc20';
diff --git a/packages/common/src/utils/ConstantsUtil.ts b/packages/common/src/utils/ConstantsUtil.ts
@@ -1,11 +1,22 @@
 export const ConstantsUtil = {
+  VERSION: '1.2.1',
+
+  EIP155: 'eip155',
+  ADD_CHAIN_METHOD: 'wallet_addEthereumChain',
+
   WC_NAME_SUFFIX: '.reown.id',
   WC_NAME_SUFFIX_LEGACY: '.wcn.id',
+
   BLOCKCHAIN_API_RPC_URL: 'https://rpc.walletconnect.org',
   PULSE_API_URL: 'https://pulse.walletconnect.org',
   API_URL: 'https://api.web3modal.org',
+
+  WALLET_CONNECT_CONNECTOR_ID: 'walletConnect',
   COINBASE_CONNECTOR_ID: 'coinbaseWallet',
+  AUTH_CONNECTOR_ID: 'appKitAuth',
+
   COINBASE_EXPLORER_ID: 'fd20dc426fb37566d803205b19bbc1d4096b248ac04548e3cfb6b3a38bd033aa',
+
   USDT_CONTRACT_ADDRESSES: [
     // Mainnet
     '0xdac17f958d2ee523a2206206994597c13d831ec7',
diff --git a/packages/common/src/utils/PresetsUtil.ts b/packages/common/src/utils/PresetsUtil.ts
@@ -1,4 +1,4 @@
-import type { ConnectorType } from '@reown/appkit-scaffold-react-native';
+import type { ConnectorType } from './TypeUtil';
 import { ConstantsUtil } from './ConstantsUtil';
 
 export const PresetsUtil = {
@@ -48,17 +48,17 @@ export const PresetsUtil = {
     1313161554: '3ff73439-a619-4894-9262-4470c773a100'
   } as Record<string, string>,
 
+  ConnectorNamesMap: {
+    [ConstantsUtil.WALLET_CONNECT_CONNECTOR_ID]: 'WalletConnect',
+    [ConstantsUtil.COINBASE_CONNECTOR_ID]: 'Coinbase Wallet',
+    [ConstantsUtil.AUTH_CONNECTOR_ID]: 'AppKit Universal Wallet'
+  } as Record<string, string>,
+
   ConnectorImageIds: {
     [ConstantsUtil.COINBASE_CONNECTOR_ID]: '0c2840c3-5b04-4c44-9661-fbd4b49e1800',
     [ConstantsUtil.WALLET_CONNECT_CONNECTOR_ID]: 'ef1a1fcf-7fe8-4d69-bd6d-fda1345b4400'
   } as Record<string, string>,
 
-  ConnectorNamesMap: {
-    [ConstantsUtil.WALLET_CONNECT_CONNECTOR_ID]: 'WalletConnect',
-    [ConstantsUtil.COINBASE_CONNECTOR_ID]: 'Coinbase',
-    [ConstantsUtil.AUTH_CONNECTOR_ID]: 'Auth'
-  } as Record<string, string>,
-
   ConnectorTypesMap: {
     [ConstantsUtil.WALLET_CONNECT_CONNECTOR_ID]: 'WALLET_CONNECT',
     [ConstantsUtil.COINBASE_CONNECTOR_ID]: 'COINBASE',
diff --git a/packages/common/src/utils/TypeUtil.ts b/packages/common/src/utils/TypeUtil.ts
@@ -93,3 +93,5 @@ export type ThemeMode = 'dark' | 'light';
 export interface ThemeVariables {
   accent?: string;
 }
+
+export type ConnectorType = 'WALLET_CONNECT' | 'COINBASE' | 'AUTH' | 'EXTERNAL';
diff --git a/packages/core/src/controllers/ConnectorController.ts b/packages/core/src/controllers/ConnectorController.ts
@@ -1,6 +1,7 @@
+import type { ConnectorType } from '@reown/appkit-common-react-native';
 import { subscribeKey as subKey } from 'valtio/utils';
 import { proxy, ref } from 'valtio';
-import type { Connector, ConnectorType } from '../utils/TypeUtil';
+import type { Connector } from '../utils/TypeUtil';
 import { StorageUtil } from '../utils/StorageUtil';
 
 // -- Types --------------------------------------------- //
diff --git a/packages/core/src/utils/StorageUtil.ts b/packages/core/src/utils/StorageUtil.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import AsyncStorage from '@react-native-async-storage/async-storage';
-import type { ConnectorType, WcWallet } from './TypeUtil';
-import type { SocialProvider } from '@reown/appkit-common-react-native';
+import type { WcWallet } from './TypeUtil';
+import type { SocialProvider, ConnectorType } from '@reown/appkit-common-react-native';
 
 // -- Helpers -----------------------------------------------------------------
 const WC_DEEPLINK = 'WALLETCONNECT_DEEPLINK_CHOICE';
diff --git a/packages/core/src/utils/TypeUtil.ts b/packages/core/src/utils/TypeUtil.ts
@@ -3,7 +3,8 @@ import type {
   Balance,
   SocialProvider,
   ThemeMode,
-  Transaction
+  Transaction,
+  ConnectorType
 } from '@reown/appkit-common-react-native';
 
 export interface BaseError {
@@ -38,8 +39,6 @@ export type ProjectId = string;
 
 export type Platform = 'mobile' | 'web' | 'qrcode' | 'email' | 'unsupported';
 
-export type ConnectorType = 'WALLET_CONNECT' | 'COINBASE' | 'AUTH' | 'EXTERNAL';
-
 export type Connector = {
   id: string;
   type: ConnectorType;
diff --git a/packages/ethers/src/client.ts b/packages/ethers/src/client.ts
@@ -28,10 +28,15 @@ import {
   type AppKitFrameAccountType,
   type EstimateGasTransactionArgs
 } from '@reown/appkit-scaffold-react-native';
-import { erc20ABI, ErrorUtil, NamesUtil, NetworkUtil } from '@reown/appkit-common-react-native';
 import {
-  ConstantsUtil,
+  erc20ABI,
+  ErrorUtil,
+  NamesUtil,
+  NetworkUtil,
   PresetsUtil,
+  ConstantsUtil
+} from '@reown/appkit-common-react-native';
+import {
   HelpersUtil,
   StorageUtil,
   EthersConstantsUtil,
@@ -957,14 +962,15 @@ export class AppKit extends AppKitScaffold {
             explorerId: PresetsUtil.ConnectorExplorerIds[ConstantsUtil.COINBASE_CONNECTOR_ID],
             imageId: PresetsUtil.ConnectorImageIds[ConstantsUtil.COINBASE_CONNECTOR_ID],
             imageUrl: this.options?.connectorImages?.[ConstantsUtil.COINBASE_CONNECTOR_ID],
-            name: PresetsUtil.ConnectorNamesMap[ConstantsUtil.COINBASE_CONNECTOR_ID],
+            name:
+              connector?.name ?? PresetsUtil.ConnectorNamesMap[ConstantsUtil.COINBASE_CONNECTOR_ID],
             type: PresetsUtil.ConnectorTypesMap[ConstantsUtil.COINBASE_CONNECTOR_ID]!
           });
           this.checkActiveCoinbaseProvider(connector as Provider);
         } else {
           _connectors.push({
             id: connector.id,
-            name: connector.name,
+            name: connector.name ?? PresetsUtil.ConnectorNamesMap[connector.id],
             type: 'EXTERNAL'
           });
         }
diff --git a/packages/ethers/src/index.tsx b/packages/ethers/src/index.tsx
@@ -1,10 +1,6 @@
 import { useEffect, useState, useSyncExternalStore } from 'react';
 import { useSnapshot } from 'valtio';
-import {
-  ConstantsUtil,
-  EthersStoreUtil,
-  type Provider
-} from '@reown/appkit-scaffold-utils-react-native';
+import { EthersStoreUtil, type Provider } from '@reown/appkit-scaffold-utils-react-native';
 
 export {
   AccountButton,
@@ -14,7 +10,7 @@ export {
   AppKit
 } from '@reown/appkit-scaffold-react-native';
 import type { EventName, EventsControllerState } from '@reown/appkit-scaffold-react-native';
-
+import { ConstantsUtil } from '@reown/appkit-common-react-native';
 export { defaultConfig } from './utils/defaultConfig';
 
 import type { AppKitOptions } from './client';
diff --git a/packages/ethers/src/utils/helpers.ts b/packages/ethers/src/utils/helpers.ts
@@ -1,5 +1,5 @@
 import type { CaipNetworkId } from '@reown/appkit-scaffold-react-native';
-import { PresetsUtil, ConstantsUtil } from '@reown/appkit-scaffold-utils-react-native';
+import { PresetsUtil, ConstantsUtil } from '@reown/appkit-common-react-native';
 import EthereumProvider from '@walletconnect/ethereum-provider';
 
 export async function getWalletConnectCaipNetworks(provider?: EthereumProvider) {
diff --git a/packages/ethers5/src/client.ts b/packages/ethers5/src/client.ts
@@ -16,8 +16,6 @@ import {
   AppKitScaffold
 } from '@reown/appkit-scaffold-react-native';
 import {
-  ConstantsUtil,
-  PresetsUtil,
   StorageUtil,
   HelpersUtil,
   EthersConstantsUtil,
@@ -38,7 +36,14 @@ import {
   getDidAddress,
   type AppKitSIWEClient
 } from '@reown/appkit-siwe-react-native';
-import { erc20ABI, ErrorUtil, NamesUtil, NetworkUtil } from '@reown/appkit-common-react-native';
+import {
+  erc20ABI,
+  ErrorUtil,
+  NamesUtil,
+  NetworkUtil,
+  ConstantsUtil,
+  PresetsUtil
+} from '@reown/appkit-common-react-native';
 import EthereumProvider, { OPTIONAL_METHODS } from '@walletconnect/ethereum-provider';
 import type { EthereumProviderOptions } from '@walletconnect/ethereum-provider';
 import { type JsonRpcError } from '@walletconnect/jsonrpc-types';
@@ -941,7 +946,7 @@ export class AppKit extends AppKitScaffold {
         } else {
           _connectors.push({
             id: connector.id,
-            name: connector.name,
+            name: connector.name ?? PresetsUtil.ConnectorNamesMap[connector.id],
             type: 'EXTERNAL'
           });
         }
diff --git a/packages/ethers5/src/index.tsx b/packages/ethers5/src/index.tsx
@@ -7,11 +7,9 @@ export {
   AppKit
 } from '@reown/appkit-scaffold-react-native';
 import type { EventName, EventsControllerState } from '@reown/appkit-scaffold-react-native';
-import {
-  ConstantsUtil,
-  EthersStoreUtil,
-  type Provider
-} from '@reown/appkit-scaffold-utils-react-native';
+import { EthersStoreUtil, type Provider } from '@reown/appkit-scaffold-utils-react-native';
+import { ConstantsUtil } from '@reown/appkit-common-react-native';
+
 export { defaultConfig } from './utils/defaultConfig';
 import { useEffect, useState, useSyncExternalStore } from 'react';
 import type { AppKitOptions } from './client';
diff --git a/packages/ethers5/src/utils/helpers.ts b/packages/ethers5/src/utils/helpers.ts
@@ -1,5 +1,5 @@
 import type { CaipNetworkId } from '@reown/appkit-scaffold-react-native';
-import { PresetsUtil, ConstantsUtil } from '@reown/appkit-scaffold-utils-react-native';
+import { PresetsUtil, ConstantsUtil } from '@reown/appkit-common-react-native';
 import EthereumProvider from '@walletconnect/ethereum-provider';
 
 export async function getWalletConnectCaipNetworks(provider?: EthereumProvider) {
diff --git a/packages/scaffold-utils/package.json b/packages/scaffold-utils/package.json
@@ -35,6 +35,7 @@
     "access": "public"
   },
   "dependencies": {
+    "@reown/appkit-common-react-native": "1.2.1",
     "@reown/appkit-scaffold-react-native": "1.2.1"
   },
   "react-native": "src/index.ts",
diff --git a/packages/scaffold-utils/src/index.ts b/packages/scaffold-utils/src/index.ts
@@ -1,5 +1,3 @@
-export { ConstantsUtil } from './utils/ConstantsUtil';
-export { PresetsUtil } from './utils/PresetsUtil';
 export { HelpersUtil } from './utils/HelpersUtil';
 export { StorageUtil } from './utils/StorageUtil';
 
diff --git a/packages/scaffold-utils/src/utils/ConstantsUtil.ts b/packages/scaffold-utils/src/utils/ConstantsUtil.ts
diff --git a/packages/scaffold-utils/src/utils/EthersHelpersUtil.ts b/packages/scaffold-utils/src/utils/EthersHelpersUtil.ts
@@ -1,6 +1,6 @@
 import type { CaipNetwork } from '@reown/appkit-scaffold-react-native';
-import { ConstantsUtil } from './ConstantsUtil';
-import { PresetsUtil } from './PresetsUtil';
+import { ConstantsUtil, PresetsUtil } from '@reown/appkit-common-react-native';
+
 import type { Chain, Provider } from './EthersTypesUtil';
 
 export const EthersHelpersUtil = {
diff --git a/packages/scaffold-utils/src/utils/HelpersUtil.ts b/packages/scaffold-utils/src/utils/HelpersUtil.ts
@@ -1,5 +1,5 @@
 import type { Tokens } from '@reown/appkit-scaffold-react-native';
-import { ConstantsUtil } from './ConstantsUtil';
+import { ConstantsUtil } from '@reown/appkit-common-react-native';
 
 export const HelpersUtil = {
   getCaipTokens(tokens?: Tokens) {
diff --git a/packages/scaffold/src/views/w3m-connect-view/components/connectors-list.tsx b/packages/scaffold/src/views/w3m-connect-view/components/connectors-list.tsx
diff --git a/packages/wagmi/src/client.ts b/packages/wagmi/src/client.ts
diff --git a/packages/wagmi/src/index.tsx b/packages/wagmi/src/index.tsx
diff --git a/packages/wagmi/src/utils/helpers.ts b/packages/wagmi/src/utils/helpers.ts
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
diff --git a/yarn.lock b/yarn.lock
