Merge pull request #2297 from oasisprotocol/lw/refactor-env-vars

Refactor REACT_APP_SKIP_GRAPH to match other env booleans

Author: lukaw3d

.changelog/2297.trivial.md

@@ -0,0 +1 @@
+Refactor REACT_APP_SKIP_GRAPH to match other env booleans

.env

@@ -29,6 +29,7 @@ REACT_APP_SHOW_BUILD_BANNERS=true
 # REACT_APP_FIXED_NETWORK=testnet
 # REACT_APP_FIXED_LAYER=sapphire
 # REACT_APP_SKIP_GRAPH=true
+REACT_APP_SKIP_GRAPH=false
 REACT_APP_SHOW_FIAT_VALUES=true
 
 # LOCALNET SETTINGS

.env.production

@@ -23,4 +23,5 @@ REACT_APP_SHOW_BUILD_BANNERS=true
 # REACT_APP_FIXED_NETWORK=testnet
 # REACT_APP_FIXED_LAYER=sapphire
 # REACT_APP_SKIP_GRAPH=true
+REACT_APP_SKIP_GRAPH=false
 REACT_APP_SHOW_FIAT_VALUES=true

src/app/utils/route-utils.ts

@@ -12,7 +12,7 @@ import { orderByLayer } from '../../types/layers'
 
 export const fixedNetwork = import.meta.env.REACT_APP_FIXED_NETWORK as Network | undefined
 export const fixedLayer = import.meta.env.REACT_APP_FIXED_LAYER as Layer | undefined
-export const skipGraph = !!fixedLayer || !!(import.meta.env.REACT_APP_SKIP_GRAPH as boolean | undefined)
+export const skipGraph = !!fixedLayer || import.meta.env.REACT_APP_SKIP_GRAPH === 'true'
 
 export type ScopeFreedom =
   | 'network' // We can select only the network

src/oasis-nexus/replaceNetworkWithBaseURL.ts

@@ -5,11 +5,11 @@ export const replaceNetworkWithBaseURL = <T>(
   requestOverrides?: AxiosRequestConfig,
 ): Promise<AxiosResponse<T>> => {
   if (config.url?.startsWith('/mainnet/')) {
-    config.url = config.url.replace('/mainnet/', import.meta.env.REACT_APP_API!)
+    config.url = config.url.replace('/mainnet/', import.meta.env.REACT_APP_API)
   } else if (config.url?.startsWith('/testnet/')) {
-    config.url = config.url.replace('/testnet/', import.meta.env.REACT_APP_TESTNET_API!)
+    config.url = config.url.replace('/testnet/', import.meta.env.REACT_APP_TESTNET_API)
   } else if (config.url?.startsWith('/localnet/')) {
-    config.url = config.url.replace('/localnet/', import.meta.env.REACT_APP_LOCALNET_API!)
+    config.url = config.url.replace('/localnet/', import.meta.env.REACT_APP_LOCALNET_API)
   } else {
     throw new Error(`Expected URL to be prefixed with network: ${config.url}`)
   }

src/types/global.d.ts

@@ -9,7 +9,7 @@ declare global {
       REACT_APP_ENABLE_OASIS_MATOMO_ANALYTICS: string
       REACT_APP_API: string
       REACT_APP_TESTNET_API: string
-      REACT_APP_LOCALNET_API?: string
+      REACT_APP_LOCALNET_API: string
       REACT_APP_SHOW_BUILD_BANNERS: 'true' | 'false'
       REACT_APP_META_TITLE: string
       REACT_APP_META_IMAGE: string
@@ -28,7 +28,7 @@ declare global {
       REACT_APP_STAGING_URLS?: string
       REACT_APP_FIXED_NETWORK?: string
       REACT_APP_FIXED_LAYER?: string
-      REACT_APP_SKIP_GRAPH?: string
+      REACT_APP_SKIP_GRAPH: 'true' | 'false'
       REACT_APP_SHOW_FIAT_VALUES: 'true' | 'false'
       REACT_APP_LOCALNET_CONSENSUS: 'true' | 'false'
       REACT_APP_LOCALNET_SAPPHIRE: 'true' | 'false'