diff --git a/.github/workflows/macstadium-tests.yml b/.github/workflows/macstadium-tests.yml index b458a442609..1853d2bb503 100644 --- a/.github/workflows/macstadium-tests.yml +++ b/.github/workflows/macstadium-tests.yml @@ -26,6 +26,9 @@ jobs: run: | source ~/.zshrc git clone git@github.com: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 diff --git a/globals.d.ts b/globals.d.ts index bd6bee49caa..4bbf63c8bbb 100644 --- a/globals.d.ts +++ b/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; diff --git a/src/env.ts b/src/env.ts index 6a92be4d329..40b636c4b36 100644 --- a/src/env.ts +++ b/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; diff --git a/src/resources/nfts/utils.ts b/src/resources/nfts/utils.ts index 7b558cd849d..14254da5cb7 100644 --- a/src/resources/nfts/utils.ts +++ b/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