chore: 1.4.2 (#180)

* fix: updated the condition to send add chain request to only check for user rejection (#175) * chore: removed fallback org logic (#176) * chore: removed fallback org logic * chore: code style * chore: replaced missing urls (#177) * chore: add clientId to BlockchainAPI requests (#178)
reown-com · Jul 11, 2024 · 09695ee · 09695ee
1 parent abe7976
commit 09695ee
Show file tree

Hide file tree

Showing 43 changed files with 285 additions and 134 deletions.
diff --git a/apps/gallery/CHANGELOG.md b/apps/gallery/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @apps/gallery
 
+## 1.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @web3modal/ui-react-native@1.4.2
+
 ## 1.0.7
 
 ### Patch Changes

diff --git a/apps/gallery/package.json b/apps/gallery/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apps/gallery",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "main": "index.js",
   "private": true,
   "devDependencies": {
@@ -33,6 +33,6 @@
   },
   "dependencies": {
     "@storybook/theming": "^7.4.6",
-    "@web3modal/ui-react-native": "1.4.1"
+    "@web3modal/ui-react-native": "1.4.2"
   }
 }
diff --git a/apps/native-cli/CHANGELOG.md b/apps/native-cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @apps/native-cli
 
+## 1.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @web3modal/wagmi-react-native@1.4.2
+
 ## 1.0.7
 
 ### Patch Changes

diff --git a/apps/native-cli/package.json b/apps/native-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apps/native-cli",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -15,7 +15,7 @@
     "@react-native-clipboard/clipboard": "1.13.0",
     "@react-native-community/netinfo": "9.3.10",
     "@walletconnect/react-native-compat": "2.10.5",
-    "@web3modal/wagmi-react-native": "1.4.1",
+    "@web3modal/wagmi-react-native": "1.4.2",
     "react": "18.2.0",
     "react-native": "0.72.6",
     "react-native-get-random-values": "~1.9.0",

diff --git a/apps/native/CHANGELOG.md b/apps/native/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @apps/native
 
+## 1.0.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @web3modal/wagmi-react-native@1.4.2
+  - @web3modal/email-wagmi-react-native@1.4.2
+
 ## 1.0.7
 
 ### Patch Changes

diff --git a/apps/native/package.json b/apps/native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apps/native",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "main": "index.js",
   "private": true,
   "scripts": {
@@ -18,8 +18,8 @@
     "@react-native-async-storage/async-storage": "1.21.0",
     "@react-native-community/netinfo": "11.1.0",
     "@walletconnect/react-native-compat": "2.10.5",
-    "@web3modal/email-wagmi-react-native": "1.4.1",
-    "@web3modal/wagmi-react-native": "1.4.1",
+    "@web3modal/email-wagmi-react-native": "1.4.2",
+    "@web3modal/wagmi-react-native": "1.4.2",
     "expo": "^50.0.14",
     "expo-application": "~5.8.3",
     "expo-clipboard": "~5.0.1",

diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "test": "turbo run test --parallel",
     "clean": "turbo clean && rm -rf node_modules && watchman watch-del-all",
     "format": "prettier --write \"**/*.{ts,tsx,js,jsx,json,md}\" --ignore-path .gitignore",
-    "pre-publish": "turbo clean lint prettier test --parallel; yarn install; turbo run build;"
+    "pre-publish": "turbo clean lint prettier --parallel; yarn install; turbo run build; turbo run test;"
   },
   "devDependencies": {
     "@changesets/changelog-github": "0.5.0",

diff --git a/packages/coinbase-ethers/CHANGELOG.md b/packages/coinbase-ethers/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @web3modal/coinbase-ethers-react-native
 
+## 1.4.2
+
+### Patch Changes
+
+- 1.4.2
+
 ## 1.4.1
 
 ### Patch Changes

diff --git a/packages/coinbase-ethers/package.json b/packages/coinbase-ethers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/coinbase-ethers-react-native",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",

diff --git a/packages/coinbase-wagmi/CHANGELOG.md b/packages/coinbase-wagmi/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @web3modal/coinbase-wagmi-react-native
 
+## 1.4.2
+
+### Patch Changes
+
+- 1.4.2
+
 ## 1.4.1
 
 ### Patch Changes

diff --git a/packages/coinbase-wagmi/package.json b/packages/coinbase-wagmi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/coinbase-wagmi-react-native",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @web3modal/core-react-native
 
+## 1.4.2
+
+### Patch Changes
+
+- 1.4.2
+
 ## 1.4.1
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/core-react-native",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",

diff --git a/packages/core/src/__tests__/controllers/AssetController.test.ts b/packages/core/src/__tests__/controllers/AssetController.test.ts
@@ -1,4 +1,6 @@
-import { AssetController } from '../../index';
+import { AssetController, CoreHelperUtil } from '../../index';
+
+const API_URL = CoreHelperUtil.getApiUrl();
 
 // -- Tests --------------------------------------------------------------------
 describe('AssetController', () => {
@@ -21,26 +23,23 @@ describe('AssetController', () => {
 
   it('should save network images correctly', () => {
     const MOCK_NETWORK_ID = '692ed6ba-e569-459a-556a-776476829e00';
-    const MOCK_NETWORK_IMAGE =
-      'https://api.web3modal.com/public/getAssetImage/692ed6ba-e569-459a-556a-776476829e00';
+    const MOCK_NETWORK_IMAGE = `${API_URL}/public/getAssetImage/692ed6ba-e569-459a-556a-776476829e00`;
 
     AssetController.setNetworkImage(MOCK_NETWORK_ID, MOCK_NETWORK_IMAGE);
     expect(AssetController.state.networkImages[MOCK_NETWORK_ID]).toEqual(MOCK_NETWORK_IMAGE);
   });
 
   it('should save wallet images correctly', () => {
     const MOCK_WALLET_ID = '7c5ff577-a68d-49c5-02cd-3d83637b0b00';
-    const MOCK_WALLET_IMAGE =
-      'https://api.web3modal.com/getWalletImage/7c5ff577-a68d-49c5-02cd-3d83637b0b00';
+    const MOCK_WALLET_IMAGE = `${API_URL}/getWalletImage/7c5ff577-a68d-49c5-02cd-3d83637b0b00`;
 
     AssetController.setWalletImage(MOCK_WALLET_ID, MOCK_WALLET_IMAGE);
     expect(AssetController.state.walletImages[MOCK_WALLET_ID]).toEqual(MOCK_WALLET_IMAGE);
   });
 
   it('should save connector images correctly', () => {
     const MOCK_CONNECTOR_ID = '7c5ff577-a68d-49c5-02cd-3d83637b0b00';
-    const MOCK_CONNECTOR_IMAGE =
-      'https://api.web3modal.com/getWalletImage/7c5ff577-a68d-49c5-02cd-3d83637b0b00';
+    const MOCK_CONNECTOR_IMAGE = `${API_URL}/getWalletImage/7c5ff577-a68d-49c5-02cd-3d83637b0b00`;
 
     AssetController.setConnectorImage(MOCK_CONNECTOR_ID, MOCK_CONNECTOR_IMAGE);
     expect(AssetController.state.connectorImages[MOCK_CONNECTOR_ID]).toEqual(MOCK_CONNECTOR_IMAGE);

diff --git a/packages/core/src/controllers/BlockchainApiController.ts b/packages/core/src/controllers/BlockchainApiController.ts
@@ -1,3 +1,6 @@
+import { proxy } from 'valtio';
+
+import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 import { FetchUtil } from '../utils/FetchUtil';
 import type {
   BlockchainApiIdentityRequest,
@@ -6,17 +9,36 @@ import type {
 import { OptionsController } from './OptionsController';
 
 // -- Helpers ------------------------------------------- //
-const api = new FetchUtil({ baseUrl: 'https://rpc.walletconnect.com' });
+const baseUrl = CoreHelperUtil.getBlockchainApiUrl();
+
+// -- Types --------------------------------------------- //
+export interface BlockchainApiControllerState {
+  clientId: string | null;
+  api: FetchUtil;
+}
+
+// -- State --------------------------------------------- //
+const state = proxy<BlockchainApiControllerState>({
+  clientId: null,
+  api: new FetchUtil({ baseUrl })
+});
 
 // -- Controller ---------------------------------------- //
 export const BlockchainApiController = {
+  state,
+
   fetchIdentity({ caipChainId, address }: BlockchainApiIdentityRequest) {
-    return api.get<BlockchainApiIdentityResponse>({
+    return state.api.get<BlockchainApiIdentityResponse>({
       path: `/v1/identity/${address}`,
       params: {
         chainId: caipChainId,
         projectId: OptionsController.state.projectId
       }
     });
+  },
+
+  setClientId(clientId: string | null) {
+    state.clientId = clientId;
+    state.api = new FetchUtil({ baseUrl, clientId });
   }
 };
diff --git a/packages/core/src/utils/ConstantsUtil.ts b/packages/core/src/utils/ConstantsUtil.ts
@@ -5,18 +5,10 @@ export const ConstantsUtil = {
 
   ONE_SEC_MS: 1000,
 
-  RESTRICTED_TIMEZONES: [
-    'ASIA/SHANGHAI',
-    'ASIA/URUMQI',
-    'ASIA/CHONGQING',
-    'ASIA/HARBIN',
-    'ASIA/KASHGAR',
-    'ASIA/MACAU',
-    'ASIA/HONG_KONG',
-    'ASIA/MACAO',
-    'ASIA/BEIJING',
-    'ASIA/HARBIN'
-  ],
+  EMAIL_REGEX: /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)+$/,
+  W3M_API_URL: 'https://api.web3modal.org',
 
-  EMAIL_REGEX: /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)+$/
+  BLOCKCHAIN_API_RPC_URL: 'https://rpc.walletconnect.org',
+
+  PULSE_API_URL: 'https://pulse.walletconnect.org'
 };
diff --git a/packages/core/src/utils/CoreHelperUtil.ts b/packages/core/src/utils/CoreHelperUtil.ts
@@ -125,33 +125,16 @@ export const CoreHelperUtil = {
     return formattedBalance ? `${formattedBalance} ${symbol}` : `0.000 ${symbol || ''}`;
   },
 
-  isRestrictedRegion() {
-    try {
-      const { timeZone } = new Intl.DateTimeFormat().resolvedOptions();
-      const capTimeZone = timeZone.toUpperCase();
-
-      return ConstantsUtil.RESTRICTED_TIMEZONES.includes(capTimeZone);
-    } catch {
-      return false;
-    }
-  },
-
   getApiUrl() {
-    return CoreHelperUtil.isRestrictedRegion()
-      ? 'https://api.web3modal.org'
-      : 'https://api.web3modal.com';
+    return ConstantsUtil.W3M_API_URL;
   },
 
   getBlockchainApiUrl() {
-    return CoreHelperUtil.isRestrictedRegion()
-      ? 'https://rpc.walletconnect.org'
-      : 'https://rpc.walletconnect.com';
+    return ConstantsUtil.BLOCKCHAIN_API_RPC_URL;
   },
 
   getAnalyticsUrl() {
-    return CoreHelperUtil.isRestrictedRegion()
-      ? 'https://pulse.walletconnect.org'
-      : 'https://pulse.walletconnect.com';
+    return ConstantsUtil.PULSE_API_URL;
   },
 
   getUUID() {

diff --git a/packages/core/src/utils/FetchUtil.ts b/packages/core/src/utils/FetchUtil.ts
@@ -1,6 +1,7 @@
 // -- Types ----------------------------------------------------------------------
 interface Options {
   baseUrl: string;
+  clientId?: string | null;
 }
 
 interface RequestArguments {
@@ -16,9 +17,11 @@ interface PostArguments extends RequestArguments {
 // -- Utility --------------------------------------------------------------------
 export class FetchUtil {
   public baseUrl: Options['baseUrl'];
+  public clientId: Options['clientId'];
 
-  public constructor({ baseUrl }: Options) {
+  public constructor({ baseUrl, clientId }: Options) {
     this.baseUrl = baseUrl;
+    this.clientId = clientId;
   }
 
   public async get<T>({ headers, ...args }: RequestArguments) {
@@ -87,6 +90,10 @@ export class FetchUtil {
       });
     }
 
+    if (this.clientId) {
+      url.searchParams.append('clientId', this.clientId);
+    }
+
     return url.toString();
   }
 

diff --git a/packages/email-ethers/CHANGELOG.md b/packages/email-ethers/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @web3modal/coinbase-wagmi-react-native
 
+## 1.4.2
+
+### Patch Changes
+
+- 1.4.2
+- Updated dependencies
+  - @web3modal/email-react-native@1.4.2
+
 ## 1.4.1
 
 ### Patch Changes

diff --git a/packages/email-ethers/package.json b/packages/email-ethers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/email-ethers-react-native",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",
@@ -37,7 +37,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@web3modal/email-react-native": "1.4.1"
+    "@web3modal/email-react-native": "1.4.2"
   },
   "peerDependencies": {
     "ethers": ">=5"

diff --git a/packages/email-wagmi/CHANGELOG.md b/packages/email-wagmi/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @web3modal/coinbase-wagmi-react-native
 
+## 1.4.2
+
+### Patch Changes
+
+- 1.4.2
+- Updated dependencies
+  - @web3modal/email-react-native@1.4.2
+
 ## 1.4.1
 
 ### Patch Changes

diff --git a/packages/email-wagmi/package.json b/packages/email-wagmi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3modal/email-wagmi-react-native",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",
@@ -37,7 +37,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@web3modal/email-react-native": "1.4.1"
+    "@web3modal/email-react-native": "1.4.2"
   },
   "peerDependencies": {
     "wagmi": ">=1 <2"