Consolidate env prod vs dev keys usage

.github/workflows/macstadium-tests.yml

@@ -26,6 +26,9 @@ jobs:
         run: |
           source ~/.zshrc
           git clone [email protected]:rainbow-me/rainbow-env.git
+          cd rainbow-env
+          git checkout @jin/prod-dev-env
+          cd ..
           mv rainbow-env/dotenv .env && rm -rf rainbow-env
           eval $CI_SCRIPTS
 

globals.d.ts

@@ -42,9 +42,6 @@ declare module 'react-native-dotenv' {
   export const PINATA_API_SECRET: string;
   export const PINATA_API_URL: string;
   export const PINATA_GATEWAY_URL: string;
-  export const APP_CENTER_READ_ONLY_TOKEN_ANDROID: string;
-  export const APP_CENTER_READ_ONLY_TOKEN_IOS: string;
-  export const CODE_PUSH_DEPLOYMENT_KEY_ANDROID: string;
   export const CODE_PUSH_DEPLOYMENT_KEY_IOS: string;
   export const NFT_API_KEY: string;
   export const NFT_API_URL: string;
@@ -63,12 +60,9 @@ declare module 'react-native-dotenv' {
   export const ARC_GRAPHQL_API_KEY: string;
   export const METADATA_GRAPHQL_API_KEY: string;
   export const GRAPH_ENS_API_KEY: string;
-  export const RESERVOIR_API_KEY_PROD: string;
-  export const RESERVOIR_API_KEY_DEV: string;
-  export const RPC_PROXY_BASE_URL_PROD: string;
-  export const RPC_PROXY_BASE_URL_DEV: string;
-  export const RPC_PROXY_API_KEY_PROD: string;
-  export const RPC_PROXY_API_KEY_DEV: string;
+  export const RESERVOIR_API_KEY: string;
+  export const RPC_PROXY_BASE_URL: string;
+  export const RPC_PROXY_API_KEY: string;
   export const REACT_NATIVE_RUDDERSTACK_WRITE_KEY: string;
   export const RUDDERSTACK_DATA_PLANE_URL: string;
   export const SILENCE_EMOJI_WARNINGS: boolean;

src/env.ts

@@ -1,5 +1,5 @@
 import ReactNative from 'react-native';
-import { ENABLE_DEV_MODE, IS_TESTING, RPC_PROXY_BASE_URL_PROD, RPC_PROXY_API_KEY_PROD } from 'react-native-dotenv';
+import { ENABLE_DEV_MODE, IS_TESTING, RPC_PROXY_BASE_URL as rpcBaseUrl, RPC_PROXY_API_KEY as rpcProxyKey } from 'react-native-dotenv';
 
 /**
  * @deprecated use IS_ANDROID
@@ -21,5 +21,5 @@ export const IS_DEV = (typeof __DEV__ === 'boolean' && __DEV__) || !!Number(ENAB
 export const IS_TEST = IS_TESTING === 'true';
 export const IS_PROD = !IS_DEV && !IS_TEST;
 
-export const RPC_PROXY_BASE_URL = RPC_PROXY_BASE_URL_PROD;
-export const RPC_PROXY_API_KEY = RPC_PROXY_API_KEY_PROD;
+export const RPC_PROXY_BASE_URL = rpcBaseUrl;
+export const RPC_PROXY_API_KEY = rpcProxyKey;

src/resources/nfts/utils.ts

@@ -3,8 +3,7 @@ import { gretch } from 'gretchen';
 import { paths } from '@reservoir0x/reservoir-sdk';
 import { RainbowError, logger } from '@/logger';
 import { handleSignificantDecimals } from '@/helpers/utilities';
-import { IS_PROD } from '@/env';
-import { RESERVOIR_API_KEY_DEV, RESERVOIR_API_KEY_PROD } from 'react-native-dotenv';
+import { RESERVOIR_API_KEY } from 'react-native-dotenv';
 import { Network } from '@/chains/types';
 
 const SUPPORTED_NETWORKS = [Network.mainnet, Network.polygon, Network.bsc, Network.arbitrum, Network.optimism, Network.base, Network.zora];
@@ -27,7 +26,7 @@ export async function fetchReservoirNFTFloorPrice(nft: UniqueAsset): Promise<str
         {
           method: 'GET',
           headers: {
-            'x-api-key': IS_PROD ? RESERVOIR_API_KEY_PROD : RESERVOIR_API_KEY_DEV,
+            'x-api-key': RESERVOIR_API_KEY,
           },
         }
       ).json();

src/resources/reservoir/client.ts

@@ -1,10 +1,8 @@
 import { createClient } from '@reservoir0x/reservoir-sdk';
 import { IS_PROD } from '@/env';
-import { RESERVOIR_API_KEY_PROD, RESERVOIR_API_KEY_DEV } from 'react-native-dotenv';
+import { RESERVOIR_API_KEY } from 'react-native-dotenv';
 import { ChainId, Network } from '@/chains/types';
 
-const RESERVOIR_API_KEY = IS_PROD ? RESERVOIR_API_KEY_PROD : RESERVOIR_API_KEY_DEV;
-
 export function initializeReservoirClient() {
   createClient({
     chains: [

src/utils/index.ts

@@ -2,7 +2,6 @@ export { default as abbreviations } from './abbreviations';
 export { default as addressUtils } from './address';
 export { default as AllowancesCache } from './allowancesCache';
 export { default as TokensListenedCache } from './tokensListenedCache';
-export { default as checkTokenIsScam } from './checkTokenIsScam';
 export { default as contenthash } from './contenthash';
 export { default as deviceUtils } from './deviceUtils';
 export { default as profileUtils } from './profileUtils';