)}
- {!onClickBack && process.env.REACT_APP_CHAIN_ID === '0x534e5f5345504f4c4941' && (
+ {!onClickBack && appConfig.get('Starknet.chainId') === '0x534e5f5345504f4c4941' && (
- Click here
+ Click here
{' '}to acquire crewmates through trade, or click here to mint your own.
*/}
diff --git a/src/game/interface/details/crewAssignments/Complete.js b/src/game/interface/details/crewAssignments/Complete.js
index 418b79847..df7823186 100644
--- a/src/game/interface/details/crewAssignments/Complete.js
+++ b/src/game/interface/details/crewAssignments/Complete.js
@@ -383,7 +383,7 @@
//
// {quest.icon}
@@ -217,7 +218,7 @@ const RewardQuests = () => {
{isLaunched && !error && !loading && (
<>
Request Free ETH
@@ -638,7 +660,7 @@ export const FundingFlow = ({ totalPrice, onClose, onFunded }) => {
{walletId !== 'argentWebWallet' && (
- {process.env.REACT_APP_CHAIN_ID === '0x534e5f5345504f4c4941' && (
+ {appConfig.get('Starknet.chainId') === '0x534e5f5345504f4c4941' && (
setWaiting(!!started)} />
@@ -664,9 +686,20 @@ export const FundingFlow = ({ totalPrice, onClose, onFunded }) => {
{ramping && (
<>
+ {!ageVerified && (
+
+ You must be over 18 years or older to make a purchase.
+ dispatchAgeVerified()}
+ success>
+
+
+ )}
-
+
diff --git a/src/game/scene/asteroid/Lots.js b/src/game/scene/asteroid/Lots.js
index 399941f83..b72121ca9 100644
--- a/src/game/scene/asteroid/Lots.js
+++ b/src/game/scene/asteroid/Lots.js
@@ -38,6 +38,7 @@ import theme from '~/theme';
import frag from './shaders/delivery.frag';
import vert from './shaders/delivery.vert';
+import { appConfig } from '~/appConfig';
const { MAX_LOTS_RENDERED } = constants;
@@ -286,7 +287,7 @@ const Lots = ({ attachTo: overrideAttachTo, asteroidId, axis, cameraAltitude, ca
}, [lotResultMap, lastLotUpdate, positionsReady]);
const handleWSMessage = useCallback((message) => {
- if (process.env.NODE_ENV !== 'production') console.log('onWSMessage (lots)', message);
+ if (appConfig.get('App.verboseLogs')) console.log('onWSMessage (lots)', message);
const { type: eventType, body } = message;
// pass the event to useMappedAsteroidLots hook to update scene
diff --git a/src/gtm.js b/src/gtm.js
index 4748c3c33..1cc31bc77 100644
--- a/src/gtm.js
+++ b/src/gtm.js
@@ -1,5 +1,7 @@
import TagManager from 'react-gtm-module';
+import { appConfig } from '~/appConfig';
+
export const initializeTagManager = () => {
- if (process.env.REACT_APP_GTM_ID) TagManager.initialize({ gtmId: process.env.REACT_APP_GTM_ID });
+ if (appConfig.get('Api.ClientId.gtm')) TagManager.initialize({ gtmId: appConfig.get('Api.ClientId.gtm') });
};
\ No newline at end of file
diff --git a/src/hooks/actionManagers/useNftSaleManager.js b/src/hooks/actionManagers/useNftSaleManager.js
index 169b81738..903e1ef9c 100644
--- a/src/hooks/actionManagers/useNftSaleManager.js
+++ b/src/hooks/actionManagers/useNftSaleManager.js
@@ -1,11 +1,12 @@
import { useCallback, useContext, useMemo } from 'react';
import { Entity } from '@influenceth/sdk';
+import { appConfig } from '~/appConfig';
import ChainTransactionContext from '~/contexts/ChainTransactionContext';
import useCrewContext from '~/hooks/useCrewContext';
const tokens = {
- [Entity.IDS.SHIP]: process.env.REACT_APP_STARKNET_SHIP_TOKEN,
+ [Entity.IDS.SHIP]: appConfig.get('Starknet.Address.shipToken'),
// TODO: add any nft tokens want to support...
};
diff --git a/src/hooks/useAnnotationContent.js b/src/hooks/useAnnotationContent.js
index e711cc708..f1ea598c2 100644
--- a/src/hooks/useAnnotationContent.js
+++ b/src/hooks/useAnnotationContent.js
@@ -1,12 +1,14 @@
import axios from 'axios';
import { useQuery } from 'react-query';
+import { appConfig } from '~/appConfig';
+
const useAnnotationContent = (annotation) => {
const hash = annotation?.ipfs?.hash;
return useQuery(
['annotation', hash],
async () => {
- const response = await axios.get(`${process.env.REACT_APP_IPFS_URL}/${hash}`);
+ const response = await axios.get(`${appConfig.get('Api.ipfs')}/${hash}`);
return response?.data?.content;
},
{ enabled: !!hash }
diff --git a/src/hooks/useBookTokens.js b/src/hooks/useBookTokens.js
index 17e434f9f..eb483ce33 100644
--- a/src/hooks/useBookTokens.js
+++ b/src/hooks/useBookTokens.js
@@ -1,5 +1,6 @@
import { useMemo } from 'react';
+import { appConfig } from '~/appConfig';
import useCrewContext from '~/hooks/useCrewContext';
import { useSwayBalance } from '~/hooks/useWalletTokenBalance';
import formatters from '~/lib/formatters';
@@ -8,7 +9,7 @@ import { safeBigInt } from '~/lib/utils';
const useBookTokens = (bookId) => {
const { captain, isLoading: crewIsLoading } = useCrewContext();
- const { data: dispatcherBalance, isLoading: swayIsLoading } = useSwayBalance(process.env.REACT_APP_STARKNET_DISPATCHER);
+ const { data: dispatcherBalance, isLoading: swayIsLoading } = useSwayBalance(appConfig.get('Starknet.Address.dispatcher'));
const swayAmount = useMemo(() => {
if (swayIsLoading) return null;
diff --git a/src/hooks/useGetActivityConfig.js b/src/hooks/useGetActivityConfig.js
index 9361c7afc..961680eea 100644
--- a/src/hooks/useGetActivityConfig.js
+++ b/src/hooks/useGetActivityConfig.js
@@ -1,6 +1,7 @@
import { useMemo } from 'react';
import { useQueryClient } from 'react-query';
+import { appConfig } from '~/appConfig';
import useCrewContext from '~/hooks/useCrewContext';
import activities, { getHydrationQueryKey } from '~/lib/activities';
@@ -36,9 +37,9 @@ const getActivityConfig = (queryClient, defaultViewingAs) => (activity, override
const onBeforeReceived = config?.onBeforeReceived ? config.onBeforeReceived(activity) : (async () => {});
const logContent = config?.getLogContent ? config.getLogContent(activity, viewingAs, prepopped) : null;
- if (logContent && activity.event.transactionHash) logContent.txLink = `${process.env.REACT_APP_STARKNET_EXPLORER_URL}/tx/${activity.event.transactionHash}`;
+ if (logContent && activity.event.transactionHash) logContent.txLink = `${appConfig.get('Url.starknetExplorer')}/tx/${activity.event.transactionHash}`;
// TODO: support L1? __t is in event record, but is not included in activity record...
- // `${process.env.REACT_APP_ETHEREUM_EXPLORER_URL}/tx/${activity.event?.transactionHash}`
+ // `${appConfig.get('Url.ethereumExplorer')}/tx/${activity.event?.transactionHash}`
const requiresCrewTime = !!config?.requiresCrewTime;
diff --git a/src/hooks/useStore.js b/src/hooks/useStore.js
index 780597f6f..504ea5b9f 100644
--- a/src/hooks/useStore.js
+++ b/src/hooks/useStore.js
@@ -9,6 +9,7 @@ import constants from '~/lib/constants';
import { TOKEN } from '~/lib/priceUtils';
import { safeBigInt } from '~/lib/utils';
import SIMULATION_CONFIG from '~/simulation/simulationConfig';
+import { appConfig } from '~/appConfig';
export const STORE_NAME = 'influence';
@@ -49,6 +50,7 @@ const simulationStateDefault = {
const useStore = create(subscribeWithSelector(persist((set, get) => ({
actionDialog: {},
+ ageVerified: false,
launcherPage: null,
launcherSubpage: null,
openHudMenu: null,
@@ -148,8 +150,8 @@ const useStore = create(subscribeWithSelector(persist((set, get) => ({
},
sounds: {
- music: process.env.NODE_ENV === 'development' ? 0 : 100,
- effects: process.env.NODE_ENV === 'development' ? 0 : 100,
+ music: appConfig.get('App.defaultMuted') ? 0 : 100,
+ effects: appConfig.get('App.defaultMuted') ? 0 : 100,
},
failedTransactions: [],
@@ -766,6 +768,10 @@ const useStore = create(subscribeWithSelector(persist((set, get) => ({
}
})),
+ dispatchAgeVerified: () => set(produce(state => {
+ state.ageVerified = true;
+ })),
+
//
// SPECIAL GETTERS
diff --git a/src/hooks/useSwapHelper.js b/src/hooks/useSwapHelper.js
index 703223d55..cfbf9730e 100644
--- a/src/hooks/useSwapHelper.js
+++ b/src/hooks/useSwapHelper.js
@@ -1,6 +1,7 @@
import { useCallback, useMemo, useRef } from 'react';
import { fetchBuildExecuteTransaction } from '@avnu/avnu-sdk';
+import { appConfig } from '~/appConfig';
import useStore from '~/hooks/useStore';
import useWalletPurchasableBalances from '~/hooks/useWalletPurchasableBalances';
import { TOKEN } from '~/lib/priceUtils';
@@ -8,7 +9,7 @@ import usePriceHelper from '~/hooks/usePriceHelper';
import api from '~/lib/api';
import useSession from '~/hooks/useSession';
-const avnuOptions = { baseUrl: process.env.REACT_APP_AVNU_API_URL };
+const avnuOptions = { baseUrl: appConfig.get('Api.avnu') };
const useSwapHelper = () => {
const { accountAddress } = useSession();
diff --git a/src/hooks/useTutorialSteps.js b/src/hooks/useTutorialSteps.js
index c3419e533..230bfa6b7 100644
--- a/src/hooks/useTutorialSteps.js
+++ b/src/hooks/useTutorialSteps.js
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useMemo } from 'react';
import { FaYoutube as YoutubeIcon } from 'react-icons/fa';
import { Building, Permission, Inventory, Product } from '@influenceth/sdk';
+import { appConfig } from '~/appConfig';
import useCrewAgreements from '~/hooks/useCrewAgreements';
import useCrewBuildings from '~/hooks/useCrewBuildings';
import useCrewContext from '~/hooks/useCrewContext';
@@ -302,7 +303,7 @@ const useTutorialSteps = () => {
<>
It seems as though you have your space legs under you now, but if you ever need further help along
the way, the Prime Council has created many resources for new Adalians to learn: visit our
- {' '}Wiki,
+ {' '}Wiki,
{' '}Youtube
{' '}or Discord to learn more!
diff --git a/src/hooks/useWebWorker.js b/src/hooks/useWebWorker.js
index dace210e6..78f4b6e41 100644
--- a/src/hooks/useWebWorker.js
+++ b/src/hooks/useWebWorker.js
@@ -4,7 +4,7 @@ import Worker from 'worker-loader!../worker'; // eslint-disable-line
let workerIds = 0;
-// TODO: remove debug
+// TODO: remove debug
// let taskTotal = 0;
// let taskTally = 0;
// let resetPending = true;
diff --git a/src/lib/activities.js b/src/lib/activities.js
index 31bf42e8e..a4a991102 100644
--- a/src/lib/activities.js
+++ b/src/lib/activities.js
@@ -2,6 +2,7 @@ import { Address, Building, Delivery, Entity, Lot, Permission, Process, Product,
import { AiFillEdit as NameIcon } from 'react-icons/ai';
import { BiTransfer as TransferIcon } from 'react-icons/bi';
+import { appConfig } from '~/appConfig';
import AddressLink from '~/components/AddressLink';
import EntityLink from '~/components/EntityLink';
import {
@@ -52,8 +53,8 @@ import { RandomEventIcon } from '~/components/AnimatedIcons';
const addressMaxWidth = '100px';
const getNamedAddress = (address) => {
- if (Address.areEqual(address, process.env.REACT_APP_STARKNET_ASTEROID_TOKEN)) return 'the Asteroid Bridge';
- else if (Address.areEqual(address, process.env.REACT_APP_STARKNET_CREWMATE_TOKEN)) return 'the Crewmate Bridge';
+ if (Address.areEqual(address, appConfig.get('Starknet.Address.asteroidToken'))) return 'the Asteroid Bridge';
+ else if (Address.areEqual(address, appConfig.get('Starknet.Address.crewmateToken'))) return 'the Crewmate Bridge';
}
const getEntityName = (entity) => {
diff --git a/src/lib/api.js b/src/lib/api.js
index 699577ff5..aadb4bec8 100644
--- a/src/lib/api.js
+++ b/src/lib/api.js
@@ -3,6 +3,7 @@ import { Asteroid, Building, Deposit, Entity, Inventory, Order, Ship } from '@in
import esb from 'elastic-builder';
import { executeSwap, fetchQuotes } from "@avnu/avnu-sdk";
+import { appConfig } from '~/appConfig';
import useStore from '~/hooks/useStore';
import { entityToAgreements, esbLocationQuery, esbPermissionQuery, safeBigInt, safeEntityId } from './utils';
import { TOKEN, TOKEN_SCALE } from './priceUtils';
@@ -11,7 +12,7 @@ import { TOKEN, TOKEN_SCALE } from './priceUtils';
const apiVersion = 'v2';
// pass initial config to axios
-const config = { baseURL: process.env.REACT_APP_API_URL, headers: {} };
+const config = { baseURL: appConfig.get('Api.influence'), headers: {} };
const initialToken = useStore.getState().currentSession?.token;
if (initialToken) config.headers = { Authorization: `Bearer ${initialToken}`};
const instance = axios.create(config);
@@ -796,7 +797,7 @@ const api = {
// AVNU endpoints
getSwapQuote: async ({ sellToken, buyToken, amount, account }) => {
- const options = { baseUrl: process.env.REACT_APP_AVNU_API_URL };
+ const options = { baseUrl: appConfig.get('Api.avnu') };
return fetchQuotes({
sellTokenAddress: sellToken,
buyTokenAddress: buyToken,
@@ -806,7 +807,7 @@ const api = {
},
executeSwaySwap: async ({ quote, account }) => {
- const options = { baseUrl: process.env.REACT_APP_AVNU_API_URL };
+ const options = { baseUrl: appConfig.get('Api.avnu') };
return executeSwap(account, quote, {}, options);
},
diff --git a/src/lib/assetUtils.js b/src/lib/assetUtils.js
index a8a3ee622..b34845616 100644
--- a/src/lib/assetUtils.js
+++ b/src/lib/assetUtils.js
@@ -1,5 +1,7 @@
import { Assets, Building, Product, Ship } from '@influenceth/sdk';
+import { appConfig } from '~/appConfig';
+
const ASSET_CACHE = {};
export const getCloudfrontUrl = (rawSlug, { w, h, f } = {}) => {
@@ -7,7 +9,7 @@ export const getCloudfrontUrl = (rawSlug, { w, h, f } = {}) => {
? window.btoa(
JSON.stringify({
key: rawSlug,
- bucket: process.env.REACT_APP_CLOUDFRONT_BUCKET,
+ bucket: appConfig.get('Cloudfront.bucket'),
edits: {
resize: {
width: w,
@@ -18,7 +20,7 @@ export const getCloudfrontUrl = (rawSlug, { w, h, f } = {}) => {
})
)
: rawSlug;
- return `${process.env.REACT_APP_CLOUDFRONT_IMAGE_URL}/${slug}`;
+ return `${appConfig.get('Cloudfront.imageUrl')}/${slug}`;
}
const getSlug = (assetName) => {
@@ -26,7 +28,7 @@ const getSlug = (assetName) => {
}
const getIconUrl = ({ type, assetName, append, w, h, f } = {}) => {
- const environment = process.env.REACT_APP_DEPLOYMENT || 'production';
+ const environment = appConfig.get('App.deployment') || 'production';
return getCloudfrontUrl(
`influence/${environment}/images/icons/${type}/${getSlug(assetName)}${append || ''}.png`,
@@ -38,7 +40,7 @@ export const getModelUrl = ({ type, assetName, modelVersion, append } = {}) => {
let slug = `models/${type}/${getSlug(assetName)}${append || ''}`;
if (modelVersion) slug += `.v${modelVersion}`;
slug += '.glb';
- return `${process.env.REACT_APP_CLOUDFRONT_OTHER_URL}/${slug}`;
+ return `${appConfig.get('Cloudfront.otherUrl')}/${slug}`;
}
export const BUILDING_SIZES = {
diff --git a/src/lib/cacheKey.js b/src/lib/cacheKey.js
index 93bce9536..b3257b2b2 100644
--- a/src/lib/cacheKey.js
+++ b/src/lib/cacheKey.js
@@ -1,4 +1,5 @@
import { Entity } from '@influenceth/sdk';
+import { appConfig } from '~/appConfig';
/* CACHE KEY DICTIONARY
non-entity based
@@ -103,7 +104,7 @@ const validFilterKeys = {
}
export const entitiesCacheKey = (label, filters) => {
- if (process.env.NODE_ENV === 'development') {
+ if (appConfig.get('App.verboseLogs')) {
if (typeof filters === 'object') {
(Object.keys(filters).find((k) => {
if (!validFilterKeys[label].includes(k)) {
diff --git a/src/lib/getAlertContent.js b/src/lib/getAlertContent.js
index 1f8b2d04e..814d7f1fb 100644
--- a/src/lib/getAlertContent.js
+++ b/src/lib/getAlertContent.js
@@ -1,3 +1,4 @@
+import { appConfig } from '~/appConfig';
import { UpdateIcon, WarningIcon, SettingsIcon, WalletIcon, ClipboardIcon } from '~/components/Icons';
const entries = {
@@ -70,7 +71,7 @@ const entries = {
return {
icon,
content,
- txLink: txHash ? `${process.env.REACT_APP_STARKNET_EXPLORER_URL}/tx/${txHash}` : null,
+ txLink: txHash ? `${appConfig.get('Url.starknetExplorer')}/tx/${txHash}` : null,
}
},
};
diff --git a/src/lib/priceUtils.js b/src/lib/priceUtils.js
index 696e4af6f..2ac630d53 100644
--- a/src/lib/priceUtils.js
+++ b/src/lib/priceUtils.js
@@ -1,12 +1,13 @@
import { Address } from '@influenceth/sdk';
+import { appConfig } from '~/appConfig';
import { EthIcon, SwayIcon } from '~/components/Icons';
import { safeBigInt } from './utils';
export const TOKEN = {
- ETH: Address.toStandard(process.env.REACT_APP_ERC20_TOKEN_ADDRESS),
- SWAY: Address.toStandard(process.env.REACT_APP_STARKNET_SWAY_TOKEN),
- USDC: Address.toStandard(process.env.REACT_APP_USDC_TOKEN_ADDRESS),
+ ETH: Address.toStandard(appConfig.get('Starknet.Address.ethToken')),
+ SWAY: Address.toStandard(appConfig.get('Starknet.Address.swayToken')),
+ USDC: Address.toStandard(appConfig.get('Starknet.Address.usdcToken')),
}
export const TOKEN_SCALE = {
diff --git a/src/lib/utils.js b/src/lib/utils.js
index e062915ce..81550d364 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -3,6 +3,7 @@ import { Crew, Entity, Lot, Order, Permission, Processor, Time } from '@influenc
import { shortString } from 'starknet';
import trim from 'lodash/trim';
+import { appConfig } from '~/appConfig';
import { ManufactureIcon, GrowIcon, AssembleIcon, RefineIcon } from '~/components/Icons';
import { TOKEN, TOKEN_SCALE } from './priceUtils';
@@ -412,7 +413,7 @@ export const safeBigInt = (unsafe) => {
return 0n;
}
-export const openAccessJSTime = `${process.env.REACT_APP_CHAIN_ID}` === `0x534e5f4d41494e` ? 1719495000e3 : 0;
+export const openAccessJSTime = `${appConfig.get('Starknet.chainId')}` === `0x534e5f4d41494e` ? 1719495000e3 : 0;
export const displayTimeFractionDigits = 2;
export const maxAnnotationLength = 750;
diff --git a/src/simulation/useSimulationSteps.js b/src/simulation/useSimulationSteps.js
index da4d37dfb..5366f3002 100644
--- a/src/simulation/useSimulationSteps.js
+++ b/src/simulation/useSimulationSteps.js
@@ -3,6 +3,7 @@ import { Building, Crewmate, Entity, Inventory, Permission, Process, Processor,
import { useHistory } from 'react-router-dom';
import { BiTransfer as TransferIcon } from 'react-icons/bi';
+import { appConfig } from '~/appConfig';
import { ZOOM_IN_ANIMATION_TIME, ZOOM_OUT_ANIMATION_TIME, ZOOM_TO_PLOT_ANIMATION_MAX_TIME, ZOOM_TO_PLOT_ANIMATION_MIN_TIME } from '~/game/scene/Asteroid';
import useCrewAgreements from '~/hooks/useCrewAgreements';
import useCrewBuildings from '~/hooks/useCrewBuildings';
@@ -1038,7 +1039,7 @@ const useSimulationSteps = () => {
You did it, congratulations! You are now officially ready to choose your career
class and start your own crew.
- Remember: the Wiki
+ Remember: the Wiki
{' '}and Discord
{' '}are resources that are always available to you when seeking help from your fellow Adalians.
@@ -1054,9 +1055,7 @@ const useSimulationSteps = () => {
disabled: connecting,
onClick: () => {
fireTrackingEvent('simulation', { step: 'login' });
-
- // webWallet does not work from localhost...
- login(process.env.NODE_ENV === 'development' ? undefined : { webWallet: true });
+ login({ webWallet: true });
// TODO: add on-logged-in url
},
}
You must be over 18 years or older to make a purchase.
+
+
diff --git a/src/game/scene/asteroid/Lots.js b/src/game/scene/asteroid/Lots.js
index 399941f83..b72121ca9 100644
--- a/src/game/scene/asteroid/Lots.js
+++ b/src/game/scene/asteroid/Lots.js
@@ -38,6 +38,7 @@ import theme from '~/theme';
import frag from './shaders/delivery.frag';
import vert from './shaders/delivery.vert';
+import { appConfig } from '~/appConfig';
const { MAX_LOTS_RENDERED } = constants;
@@ -286,7 +287,7 @@ const Lots = ({ attachTo: overrideAttachTo, asteroidId, axis, cameraAltitude, ca
}, [lotResultMap, lastLotUpdate, positionsReady]);
const handleWSMessage = useCallback((message) => {
- if (process.env.NODE_ENV !== 'production') console.log('onWSMessage (lots)', message);
+ if (appConfig.get('App.verboseLogs')) console.log('onWSMessage (lots)', message);
const { type: eventType, body } = message;
// pass the event to useMappedAsteroidLots hook to update scene
diff --git a/src/gtm.js b/src/gtm.js
index 4748c3c33..1cc31bc77 100644
--- a/src/gtm.js
+++ b/src/gtm.js
@@ -1,5 +1,7 @@
import TagManager from 'react-gtm-module';
+import { appConfig } from '~/appConfig';
+
export const initializeTagManager = () => {
- if (process.env.REACT_APP_GTM_ID) TagManager.initialize({ gtmId: process.env.REACT_APP_GTM_ID });
+ if (appConfig.get('Api.ClientId.gtm')) TagManager.initialize({ gtmId: appConfig.get('Api.ClientId.gtm') });
};
\ No newline at end of file
diff --git a/src/hooks/actionManagers/useNftSaleManager.js b/src/hooks/actionManagers/useNftSaleManager.js
index 169b81738..903e1ef9c 100644
--- a/src/hooks/actionManagers/useNftSaleManager.js
+++ b/src/hooks/actionManagers/useNftSaleManager.js
@@ -1,11 +1,12 @@
import { useCallback, useContext, useMemo } from 'react';
import { Entity } from '@influenceth/sdk';
+import { appConfig } from '~/appConfig';
import ChainTransactionContext from '~/contexts/ChainTransactionContext';
import useCrewContext from '~/hooks/useCrewContext';
const tokens = {
- [Entity.IDS.SHIP]: process.env.REACT_APP_STARKNET_SHIP_TOKEN,
+ [Entity.IDS.SHIP]: appConfig.get('Starknet.Address.shipToken'),
// TODO: add any nft tokens want to support...
};
diff --git a/src/hooks/useAnnotationContent.js b/src/hooks/useAnnotationContent.js
index e711cc708..f1ea598c2 100644
--- a/src/hooks/useAnnotationContent.js
+++ b/src/hooks/useAnnotationContent.js
@@ -1,12 +1,14 @@
import axios from 'axios';
import { useQuery } from 'react-query';
+import { appConfig } from '~/appConfig';
+
const useAnnotationContent = (annotation) => {
const hash = annotation?.ipfs?.hash;
return useQuery(
['annotation', hash],
async () => {
- const response = await axios.get(`${process.env.REACT_APP_IPFS_URL}/${hash}`);
+ const response = await axios.get(`${appConfig.get('Api.ipfs')}/${hash}`);
return response?.data?.content;
},
{ enabled: !!hash }
diff --git a/src/hooks/useBookTokens.js b/src/hooks/useBookTokens.js
index 17e434f9f..eb483ce33 100644
--- a/src/hooks/useBookTokens.js
+++ b/src/hooks/useBookTokens.js
@@ -1,5 +1,6 @@
import { useMemo } from 'react';
+import { appConfig } from '~/appConfig';
import useCrewContext from '~/hooks/useCrewContext';
import { useSwayBalance } from '~/hooks/useWalletTokenBalance';
import formatters from '~/lib/formatters';
@@ -8,7 +9,7 @@ import { safeBigInt } from '~/lib/utils';
const useBookTokens = (bookId) => {
const { captain, isLoading: crewIsLoading } = useCrewContext();
- const { data: dispatcherBalance, isLoading: swayIsLoading } = useSwayBalance(process.env.REACT_APP_STARKNET_DISPATCHER);
+ const { data: dispatcherBalance, isLoading: swayIsLoading } = useSwayBalance(appConfig.get('Starknet.Address.dispatcher'));
const swayAmount = useMemo(() => {
if (swayIsLoading) return null;
diff --git a/src/hooks/useGetActivityConfig.js b/src/hooks/useGetActivityConfig.js
index 9361c7afc..961680eea 100644
--- a/src/hooks/useGetActivityConfig.js
+++ b/src/hooks/useGetActivityConfig.js
@@ -1,6 +1,7 @@
import { useMemo } from 'react';
import { useQueryClient } from 'react-query';
+import { appConfig } from '~/appConfig';
import useCrewContext from '~/hooks/useCrewContext';
import activities, { getHydrationQueryKey } from '~/lib/activities';
@@ -36,9 +37,9 @@ const getActivityConfig = (queryClient, defaultViewingAs) => (activity, override
const onBeforeReceived = config?.onBeforeReceived ? config.onBeforeReceived(activity) : (async () => {});
const logContent = config?.getLogContent ? config.getLogContent(activity, viewingAs, prepopped) : null;
- if (logContent && activity.event.transactionHash) logContent.txLink = `${process.env.REACT_APP_STARKNET_EXPLORER_URL}/tx/${activity.event.transactionHash}`;
+ if (logContent && activity.event.transactionHash) logContent.txLink = `${appConfig.get('Url.starknetExplorer')}/tx/${activity.event.transactionHash}`;
// TODO: support L1? __t is in event record, but is not included in activity record...
- // `${process.env.REACT_APP_ETHEREUM_EXPLORER_URL}/tx/${activity.event?.transactionHash}`
+ // `${appConfig.get('Url.ethereumExplorer')}/tx/${activity.event?.transactionHash}`
const requiresCrewTime = !!config?.requiresCrewTime;
diff --git a/src/hooks/useStore.js b/src/hooks/useStore.js
index 780597f6f..504ea5b9f 100644
--- a/src/hooks/useStore.js
+++ b/src/hooks/useStore.js
@@ -9,6 +9,7 @@ import constants from '~/lib/constants';
import { TOKEN } from '~/lib/priceUtils';
import { safeBigInt } from '~/lib/utils';
import SIMULATION_CONFIG from '~/simulation/simulationConfig';
+import { appConfig } from '~/appConfig';
export const STORE_NAME = 'influence';
@@ -49,6 +50,7 @@ const simulationStateDefault = {
const useStore = create(subscribeWithSelector(persist((set, get) => ({
actionDialog: {},
+ ageVerified: false,
launcherPage: null,
launcherSubpage: null,
openHudMenu: null,
@@ -148,8 +150,8 @@ const useStore = create(subscribeWithSelector(persist((set, get) => ({
},
sounds: {
- music: process.env.NODE_ENV === 'development' ? 0 : 100,
- effects: process.env.NODE_ENV === 'development' ? 0 : 100,
+ music: appConfig.get('App.defaultMuted') ? 0 : 100,
+ effects: appConfig.get('App.defaultMuted') ? 0 : 100,
},
failedTransactions: [],
@@ -766,6 +768,10 @@ const useStore = create(subscribeWithSelector(persist((set, get) => ({
}
})),
+ dispatchAgeVerified: () => set(produce(state => {
+ state.ageVerified = true;
+ })),
+
//
// SPECIAL GETTERS
diff --git a/src/hooks/useSwapHelper.js b/src/hooks/useSwapHelper.js
index 703223d55..cfbf9730e 100644
--- a/src/hooks/useSwapHelper.js
+++ b/src/hooks/useSwapHelper.js
@@ -1,6 +1,7 @@
import { useCallback, useMemo, useRef } from 'react';
import { fetchBuildExecuteTransaction } from '@avnu/avnu-sdk';
+import { appConfig } from '~/appConfig';
import useStore from '~/hooks/useStore';
import useWalletPurchasableBalances from '~/hooks/useWalletPurchasableBalances';
import { TOKEN } from '~/lib/priceUtils';
@@ -8,7 +9,7 @@ import usePriceHelper from '~/hooks/usePriceHelper';
import api from '~/lib/api';
import useSession from '~/hooks/useSession';
-const avnuOptions = { baseUrl: process.env.REACT_APP_AVNU_API_URL };
+const avnuOptions = { baseUrl: appConfig.get('Api.avnu') };
const useSwapHelper = () => {
const { accountAddress } = useSession();
diff --git a/src/hooks/useTutorialSteps.js b/src/hooks/useTutorialSteps.js
index c3419e533..230bfa6b7 100644
--- a/src/hooks/useTutorialSteps.js
+++ b/src/hooks/useTutorialSteps.js
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useMemo } from 'react';
import { FaYoutube as YoutubeIcon } from 'react-icons/fa';
import { Building, Permission, Inventory, Product } from '@influenceth/sdk';
+import { appConfig } from '~/appConfig';
import useCrewAgreements from '~/hooks/useCrewAgreements';
import useCrewBuildings from '~/hooks/useCrewBuildings';
import useCrewContext from '~/hooks/useCrewContext';
@@ -302,7 +303,7 @@ const useTutorialSteps = () => {
<>
It seems as though you have your space legs under you now, but if you ever need further help along
the way, the Prime Council has created many resources for new Adalians to learn: visit our
- {' '}Wiki,
+ {' '}Wiki,
{' '}Youtube
{' '}or Discord to learn more!
diff --git a/src/hooks/useWebWorker.js b/src/hooks/useWebWorker.js
index dace210e6..78f4b6e41 100644
--- a/src/hooks/useWebWorker.js
+++ b/src/hooks/useWebWorker.js
@@ -4,7 +4,7 @@ import Worker from 'worker-loader!../worker'; // eslint-disable-line
let workerIds = 0;
-// TODO: remove debug
+// TODO: remove debug
// let taskTotal = 0;
// let taskTally = 0;
// let resetPending = true;
diff --git a/src/lib/activities.js b/src/lib/activities.js
index 31bf42e8e..a4a991102 100644
--- a/src/lib/activities.js
+++ b/src/lib/activities.js
@@ -2,6 +2,7 @@ import { Address, Building, Delivery, Entity, Lot, Permission, Process, Product,
import { AiFillEdit as NameIcon } from 'react-icons/ai';
import { BiTransfer as TransferIcon } from 'react-icons/bi';
+import { appConfig } from '~/appConfig';
import AddressLink from '~/components/AddressLink';
import EntityLink from '~/components/EntityLink';
import {
@@ -52,8 +53,8 @@ import { RandomEventIcon } from '~/components/AnimatedIcons';
const addressMaxWidth = '100px';
const getNamedAddress = (address) => {
- if (Address.areEqual(address, process.env.REACT_APP_STARKNET_ASTEROID_TOKEN)) return 'the Asteroid Bridge';
- else if (Address.areEqual(address, process.env.REACT_APP_STARKNET_CREWMATE_TOKEN)) return 'the Crewmate Bridge';
+ if (Address.areEqual(address, appConfig.get('Starknet.Address.asteroidToken'))) return 'the Asteroid Bridge';
+ else if (Address.areEqual(address, appConfig.get('Starknet.Address.crewmateToken'))) return 'the Crewmate Bridge';
}
const getEntityName = (entity) => {
diff --git a/src/lib/api.js b/src/lib/api.js
index 699577ff5..aadb4bec8 100644
--- a/src/lib/api.js
+++ b/src/lib/api.js
@@ -3,6 +3,7 @@ import { Asteroid, Building, Deposit, Entity, Inventory, Order, Ship } from '@in
import esb from 'elastic-builder';
import { executeSwap, fetchQuotes } from "@avnu/avnu-sdk";
+import { appConfig } from '~/appConfig';
import useStore from '~/hooks/useStore';
import { entityToAgreements, esbLocationQuery, esbPermissionQuery, safeBigInt, safeEntityId } from './utils';
import { TOKEN, TOKEN_SCALE } from './priceUtils';
@@ -11,7 +12,7 @@ import { TOKEN, TOKEN_SCALE } from './priceUtils';
const apiVersion = 'v2';
// pass initial config to axios
-const config = { baseURL: process.env.REACT_APP_API_URL, headers: {} };
+const config = { baseURL: appConfig.get('Api.influence'), headers: {} };
const initialToken = useStore.getState().currentSession?.token;
if (initialToken) config.headers = { Authorization: `Bearer ${initialToken}`};
const instance = axios.create(config);
@@ -796,7 +797,7 @@ const api = {
// AVNU endpoints
getSwapQuote: async ({ sellToken, buyToken, amount, account }) => {
- const options = { baseUrl: process.env.REACT_APP_AVNU_API_URL };
+ const options = { baseUrl: appConfig.get('Api.avnu') };
return fetchQuotes({
sellTokenAddress: sellToken,
buyTokenAddress: buyToken,
@@ -806,7 +807,7 @@ const api = {
},
executeSwaySwap: async ({ quote, account }) => {
- const options = { baseUrl: process.env.REACT_APP_AVNU_API_URL };
+ const options = { baseUrl: appConfig.get('Api.avnu') };
return executeSwap(account, quote, {}, options);
},
diff --git a/src/lib/assetUtils.js b/src/lib/assetUtils.js
index a8a3ee622..b34845616 100644
--- a/src/lib/assetUtils.js
+++ b/src/lib/assetUtils.js
@@ -1,5 +1,7 @@
import { Assets, Building, Product, Ship } from '@influenceth/sdk';
+import { appConfig } from '~/appConfig';
+
const ASSET_CACHE = {};
export const getCloudfrontUrl = (rawSlug, { w, h, f } = {}) => {
@@ -7,7 +9,7 @@ export const getCloudfrontUrl = (rawSlug, { w, h, f } = {}) => {
? window.btoa(
JSON.stringify({
key: rawSlug,
- bucket: process.env.REACT_APP_CLOUDFRONT_BUCKET,
+ bucket: appConfig.get('Cloudfront.bucket'),
edits: {
resize: {
width: w,
@@ -18,7 +20,7 @@ export const getCloudfrontUrl = (rawSlug, { w, h, f } = {}) => {
})
)
: rawSlug;
- return `${process.env.REACT_APP_CLOUDFRONT_IMAGE_URL}/${slug}`;
+ return `${appConfig.get('Cloudfront.imageUrl')}/${slug}`;
}
const getSlug = (assetName) => {
@@ -26,7 +28,7 @@ const getSlug = (assetName) => {
}
const getIconUrl = ({ type, assetName, append, w, h, f } = {}) => {
- const environment = process.env.REACT_APP_DEPLOYMENT || 'production';
+ const environment = appConfig.get('App.deployment') || 'production';
return getCloudfrontUrl(
`influence/${environment}/images/icons/${type}/${getSlug(assetName)}${append || ''}.png`,
@@ -38,7 +40,7 @@ export const getModelUrl = ({ type, assetName, modelVersion, append } = {}) => {
let slug = `models/${type}/${getSlug(assetName)}${append || ''}`;
if (modelVersion) slug += `.v${modelVersion}`;
slug += '.glb';
- return `${process.env.REACT_APP_CLOUDFRONT_OTHER_URL}/${slug}`;
+ return `${appConfig.get('Cloudfront.otherUrl')}/${slug}`;
}
export const BUILDING_SIZES = {
diff --git a/src/lib/cacheKey.js b/src/lib/cacheKey.js
index 93bce9536..b3257b2b2 100644
--- a/src/lib/cacheKey.js
+++ b/src/lib/cacheKey.js
@@ -1,4 +1,5 @@
import { Entity } from '@influenceth/sdk';
+import { appConfig } from '~/appConfig';
/* CACHE KEY DICTIONARY
non-entity based
@@ -103,7 +104,7 @@ const validFilterKeys = {
}
export const entitiesCacheKey = (label, filters) => {
- if (process.env.NODE_ENV === 'development') {
+ if (appConfig.get('App.verboseLogs')) {
if (typeof filters === 'object') {
(Object.keys(filters).find((k) => {
if (!validFilterKeys[label].includes(k)) {
diff --git a/src/lib/getAlertContent.js b/src/lib/getAlertContent.js
index 1f8b2d04e..814d7f1fb 100644
--- a/src/lib/getAlertContent.js
+++ b/src/lib/getAlertContent.js
@@ -1,3 +1,4 @@
+import { appConfig } from '~/appConfig';
import { UpdateIcon, WarningIcon, SettingsIcon, WalletIcon, ClipboardIcon } from '~/components/Icons';
const entries = {
@@ -70,7 +71,7 @@ const entries = {
return {
icon,
content,
- txLink: txHash ? `${process.env.REACT_APP_STARKNET_EXPLORER_URL}/tx/${txHash}` : null,
+ txLink: txHash ? `${appConfig.get('Url.starknetExplorer')}/tx/${txHash}` : null,
}
},
};
diff --git a/src/lib/priceUtils.js b/src/lib/priceUtils.js
index 696e4af6f..2ac630d53 100644
--- a/src/lib/priceUtils.js
+++ b/src/lib/priceUtils.js
@@ -1,12 +1,13 @@
import { Address } from '@influenceth/sdk';
+import { appConfig } from '~/appConfig';
import { EthIcon, SwayIcon } from '~/components/Icons';
import { safeBigInt } from './utils';
export const TOKEN = {
- ETH: Address.toStandard(process.env.REACT_APP_ERC20_TOKEN_ADDRESS),
- SWAY: Address.toStandard(process.env.REACT_APP_STARKNET_SWAY_TOKEN),
- USDC: Address.toStandard(process.env.REACT_APP_USDC_TOKEN_ADDRESS),
+ ETH: Address.toStandard(appConfig.get('Starknet.Address.ethToken')),
+ SWAY: Address.toStandard(appConfig.get('Starknet.Address.swayToken')),
+ USDC: Address.toStandard(appConfig.get('Starknet.Address.usdcToken')),
}
export const TOKEN_SCALE = {
diff --git a/src/lib/utils.js b/src/lib/utils.js
index e062915ce..81550d364 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -3,6 +3,7 @@ import { Crew, Entity, Lot, Order, Permission, Processor, Time } from '@influenc
import { shortString } from 'starknet';
import trim from 'lodash/trim';
+import { appConfig } from '~/appConfig';
import { ManufactureIcon, GrowIcon, AssembleIcon, RefineIcon } from '~/components/Icons';
import { TOKEN, TOKEN_SCALE } from './priceUtils';
@@ -412,7 +413,7 @@ export const safeBigInt = (unsafe) => {
return 0n;
}
-export const openAccessJSTime = `${process.env.REACT_APP_CHAIN_ID}` === `0x534e5f4d41494e` ? 1719495000e3 : 0;
+export const openAccessJSTime = `${appConfig.get('Starknet.chainId')}` === `0x534e5f4d41494e` ? 1719495000e3 : 0;
export const displayTimeFractionDigits = 2;
export const maxAnnotationLength = 750;
diff --git a/src/simulation/useSimulationSteps.js b/src/simulation/useSimulationSteps.js
index da4d37dfb..5366f3002 100644
--- a/src/simulation/useSimulationSteps.js
+++ b/src/simulation/useSimulationSteps.js
@@ -3,6 +3,7 @@ import { Building, Crewmate, Entity, Inventory, Permission, Process, Processor,
import { useHistory } from 'react-router-dom';
import { BiTransfer as TransferIcon } from 'react-icons/bi';
+import { appConfig } from '~/appConfig';
import { ZOOM_IN_ANIMATION_TIME, ZOOM_OUT_ANIMATION_TIME, ZOOM_TO_PLOT_ANIMATION_MAX_TIME, ZOOM_TO_PLOT_ANIMATION_MIN_TIME } from '~/game/scene/Asteroid';
import useCrewAgreements from '~/hooks/useCrewAgreements';
import useCrewBuildings from '~/hooks/useCrewBuildings';
@@ -1038,7 +1039,7 @@ const useSimulationSteps = () => {
You did it, congratulations! You are now officially ready to choose your career
class and start your own crew.
- Remember: the Wiki + Remember: the Wiki {' '}and Discord {' '}are resources that are always available to you when seeking help from your fellow Adalians.
@@ -1054,9 +1055,7 @@ const useSimulationSteps = () => { disabled: connecting, onClick: () => { fireTrackingEvent('simulation', { step: 'login' }); - - // webWallet does not work from localhost... - login(process.env.NODE_ENV === 'development' ? undefined : { webWallet: true }); + login({ webWallet: true }); // TODO: add on-logged-in url }, }
- Remember: the Wiki + Remember: the Wiki {' '}and Discord {' '}are resources that are always available to you when seeking help from your fellow Adalians.
@@ -1054,9 +1055,7 @@ const useSimulationSteps = () => { disabled: connecting, onClick: () => { fireTrackingEvent('simulation', { step: 'login' }); - - // webWallet does not work from localhost... - login(process.env.NODE_ENV === 'development' ? undefined : { webWallet: true }); + login({ webWallet: true }); // TODO: add on-logged-in url }, }