)}
- {!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..6ba994c40 100644
--- a/src/game/interface/details/crewAssignments/Complete.js
+++ b/src/game/interface/details/crewAssignments/Complete.js
@@ -383,7 +383,7 @@
//
//
Request Free ETH
@@ -638,7 +638,7 @@ export const FundingFlow = ({ totalPrice, onClose, onFunded }) => {
{walletId !== 'argentWebWallet' && (
- {process.env.REACT_APP_CHAIN_ID === '0x534e5f5345504f4c4941' && (
+ {appConfig.get('Starknet.chainId') === '0x534e5f5345504f4c4941' && (
setWaiting(!!started)} />
diff --git a/src/game/launcher/components/RewardMissions.js b/src/game/launcher/components/RewardMissions.js
index 5e7be0978..a835a1fba 100644
--- a/src/game/launcher/components/RewardMissions.js
+++ b/src/game/launcher/components/RewardMissions.js
@@ -2,6 +2,7 @@ import { useCallback, useState } from 'react';
import styled from 'styled-components';
import Loader from 'react-spinners/PuffLoader';
+import appConfig from '~/appConfig';
import AsteroidsHeroImage from '~/assets/images/sales/asteroids_hero.png';
import AsteroidSurfaceImage from '~/assets/images/hud_headers/Asteroid.png';
import ClipCorner from '~/components/ClipCorner';
@@ -327,7 +328,7 @@ const MissionWrapper = styled.div`
const Mission = ({ mission, mode }) => {
const createAlert = useStore(s => s.dispatchAlertLogged);
const onClick = useCallback(() => {
- const targetUrl = mode === 'community' ? process.env.REACT_APP_COMMUNITY_MISSIONS_URL : process.env.REACT_APP_COLONIZATION_MISSIONS_URL;
+ const targetUrl = mode === 'community' ? appConfig.get('Url.communityMissions') : appConfig.get('Url.colonizationMissions');
if (targetUrl) {
window.open(targetUrl);
}
@@ -377,8 +378,8 @@ const RewardMissions = ({ mode }) => {
{mode === 'colonization' && (
@@ -386,7 +387,7 @@ const RewardMissions = ({ mode }) => {
{mode === 'community' && (
)}
diff --git a/src/game/launcher/components/RewardQuests.js b/src/game/launcher/components/RewardQuests.js
index a91f9f604..443acc082 100644
--- a/src/game/launcher/components/RewardQuests.js
+++ b/src/game/launcher/components/RewardQuests.js
@@ -2,6 +2,7 @@ import { useState } from 'react';
import styled from 'styled-components';
import Loader from 'react-spinners/PuffLoader';
+import appConfig from '~/appConfig';
import Image1 from '~/assets/images/hud_headers/Asteroid.png';
import Image2 from '~/assets/images/hud_headers/SurfaceShip.png';
import Image3 from '~/assets/images/hud_headers/Building_9.png';
@@ -192,7 +193,7 @@ const quests = [
const Quest = ({ quest }) => {
return (
- window.open(process.env.REACT_APP_SOCIAL_QUESTS_URL)}>
+ window.open(appConfig.get('Url.socialQuests'))}>
{quest.icon}
@@ -217,7 +218,7 @@ const RewardQuests = () => {
{isLaunched && !error && !loading && (
<>
{quests.map((quest) =>
diff --git a/src/game/scene/asteroid/Lots.js b/src/game/scene/asteroid/Lots.js
index 399941f83..621effb16 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..d42bb09a0 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..4cd74bdcb 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..7284dfd77 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..1292a7245 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..6e4b51321 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..a0b3004d8 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';
@@ -148,8 +149,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: [],
diff --git a/src/hooks/useSwapHelper.js b/src/hooks/useSwapHelper.js
index f0a31b7c7..5410630b7 100644
--- a/src/hooks/useSwapHelper.js
+++ b/src/hooks/useSwapHelper.js
@@ -1,6 +1,7 @@
import { useCallback, useMemo } 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..88e535b84 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/lib/activities.js b/src/lib/activities.js
index 31bf42e8e..fa03071b2 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..bbdbd291d 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..0afa93358 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..5787b5477 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..4dca89555 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 8dd987e53..746d7a4a2 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 a98b1e2c6..c110ec7ce 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';
@@ -387,7 +388,7 @@ export const safeBigInt = (unsafe) => {
return BigInt(Math.round(Number(unsafe || 0)));
}
-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..e64dab0c0 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
},
}
From f6b558d90d5e3529bdbf350c687a0d15ceb60252 Mon Sep 17 00:00:00 2001
From: Patrick Keenum <5631043+prof197@users.noreply.github.com>
Date: Thu, 26 Sep 2024 14:31:06 -0400
Subject: [PATCH 2/9] fix for opengraph stuff (hopefully)
---
opengraph.js | 4 ++--
src/Game.js | 2 +-
src/ScreensizeWarning.js | 2 +-
src/appConfig/index.js | 14 ++++++++------
src/components/BridgeModalDialog.js | 2 +-
src/components/CrewmateCard.js | 2 +-
src/components/MarketplaceLink.js | 2 +-
src/contexts/ActivitiesContext.js | 2 +-
src/contexts/ChainTransactionContext.js | 2 +-
src/contexts/CrewContext.js | 2 +-
src/contexts/SessionContext.js | 2 +-
src/contexts/WebsocketContext.js | 2 +-
src/game/Audio.js | 2 +-
src/game/ChatListener.js | 2 +-
src/game/GpuContextLost.js | 2 +-
src/game/Interface.js | 2 +-
src/game/Launcher.js | 2 +-
src/game/interface/MainMenu.js | 2 +-
src/game/interface/RecruitCrewmate.js | 2 +-
.../interface/details/listViews/actionItems.js | 2 +-
src/game/interface/hud/ActionItem.js | 2 +-
src/game/interface/hud/HudMenu.js | 2 +-
src/game/interface/hud/TutorialMessage.js | 2 +-
src/game/interface/hud/WelcomeSimulation.js | 2 +-
.../interface/hud/actionDialogs/FormAgreement.js | 2 +-
src/game/interface/hud/hudMenus/DevTools.js | 2 +-
src/game/launcher/Help.js | 2 +-
src/game/launcher/Rewards.js | 2 +-
src/game/launcher/components/FundingFlow.js | 2 +-
src/game/launcher/components/RewardMissions.js | 2 +-
src/game/launcher/components/RewardQuests.js | 2 +-
src/game/launcher/components/SKU.js | 2 +-
src/game/launcher/components/SupportMenu.js | 2 +-
src/game/scene/asteroid/Lots.js | 2 +-
src/gtm.js | 2 +-
src/hooks/actionManagers/useNftSaleManager.js | 2 +-
src/hooks/useAnnotationContent.js | 2 +-
src/hooks/useBookTokens.js | 2 +-
src/hooks/useGetActivityConfig.js | 2 +-
src/hooks/useStore.js | 2 +-
src/hooks/useSwapHelper.js | 2 +-
src/hooks/useTutorialSteps.js | 2 +-
src/lib/activities.js | 2 +-
src/lib/api.js | 2 +-
src/lib/assetUtils.js | 2 +-
src/lib/cacheKey.js | 2 +-
src/lib/getAlertContent.js | 2 +-
src/lib/priceUtils.js | 2 +-
src/lib/utils.js | 2 +-
src/simulation/useSimulationSteps.js | 2 +-
50 files changed, 58 insertions(+), 56 deletions(-)
diff --git a/opengraph.js b/opengraph.js
index 64b2b3c5d..dd01d49c9 100644
--- a/opengraph.js
+++ b/opengraph.js
@@ -1,9 +1,9 @@
const axios = require('axios');
const probe = require('probe-image-size');
-const appConfig = require('./src/appConfig');
+const { appConfig } = require('./src/appConfig');
-const instance = axios.create({ baseURL: `${appConfig.get('Api.influence')}/og/data` });
+const instance = axios.create({ baseURL: `${appConfig.get('Api.influence')}/og/data?t=1` });
const getOpengraphTags = async (originalUrl) => {
const urlParts = originalUrl.split('/').slice(1);
diff --git a/src/Game.js b/src/Game.js
index f13fecd41..c01643ae1 100644
--- a/src/Game.js
+++ b/src/Game.js
@@ -6,7 +6,7 @@ import { useDetectGPU } from '@react-three/drei';
import { initializeTagManager } from './gtm';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import FullpageInterstitial from '~/components/FullpageInterstitial';
import { ActionItemProvider } from '~/contexts/ActionItemContext';
import { ActivitiesProvider } from '~/contexts/ActivitiesContext';
diff --git a/src/ScreensizeWarning.js b/src/ScreensizeWarning.js
index 657fb622f..55890b0a2 100644
--- a/src/ScreensizeWarning.js
+++ b/src/ScreensizeWarning.js
@@ -1,6 +1,6 @@
import { useState } from 'react';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import FullpageInterstitial from '~/components/FullpageInterstitial';
import useScreenSize from '~/hooks/useScreenSize';
import theme from '~/theme';
diff --git a/src/appConfig/index.js b/src/appConfig/index.js
index 88e8dbc89..61edc2cfb 100644
--- a/src/appConfig/index.js
+++ b/src/appConfig/index.js
@@ -30,7 +30,7 @@ const rawConfig = {
};
// override config with environment variables
-const appConfig = reduce(
+const appConfigData = reduce(
rawConfig,
(res, v, key) => {
const overrideKey = `REACT_APP_${key.replace(/\./g, '_').toUpperCase()}`;
@@ -42,10 +42,12 @@ const appConfig = reduce(
rawConfig
);
-export default {
+const appConfig = {
get: (key) => {
- if (!appConfig.hasOwnProperty(key)) throw new Error(`Invalid appConfig key: "${key}"`);
- return appConfig[key];
+ if (!appConfigData.hasOwnProperty(key)) throw new Error(`Invalid appConfig key: "${key}"`);
+ return appConfigData[key];
},
- has: (key) => appConfig.hasOwnProperty(key),
-};
\ No newline at end of file
+ has: (key) => appConfigData.hasOwnProperty(key),
+};
+
+export { appConfig };
diff --git a/src/components/BridgeModalDialog.js b/src/components/BridgeModalDialog.js
index 89ad42d70..f99f0fa2b 100644
--- a/src/components/BridgeModalDialog.js
+++ b/src/components/BridgeModalDialog.js
@@ -1,7 +1,7 @@
import React from 'react';
import styled from 'styled-components';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import BrightButton from '~/components/BrightButton';
import IconButton from '~/components/IconButton';
import { CloseIcon } from '~/components/Icons';
diff --git a/src/components/CrewmateCard.js b/src/components/CrewmateCard.js
index 3f20e001f..62e5cf333 100644
--- a/src/components/CrewmateCard.js
+++ b/src/components/CrewmateCard.js
@@ -4,7 +4,7 @@ import styled, { css } from 'styled-components';
import pick from 'lodash/pick';
import { Crewmate } from '@influenceth/sdk';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import silhouette from '~/assets/images/silhouette.png';
import CrewmateCardOverlay, { cardTransitionSpeed, cardTransitionFunction } from '~/components/CrewmateCardOverlay';
import CrewClassIcon from '~/components/CrewClassIcon';
diff --git a/src/components/MarketplaceLink.js b/src/components/MarketplaceLink.js
index e81f9a96d..6f50a813a 100644
--- a/src/components/MarketplaceLink.js
+++ b/src/components/MarketplaceLink.js
@@ -1,6 +1,6 @@
import { useCallback, useState, } from 'react';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
const MarketplaceLink = ({ assetType, chain, children, id }) => {
const [referenceEl, setReferenceEl] = useState();
diff --git a/src/contexts/ActivitiesContext.js b/src/contexts/ActivitiesContext.js
index 721e054c1..af0ab6b99 100644
--- a/src/contexts/ActivitiesContext.js
+++ b/src/contexts/ActivitiesContext.js
@@ -11,7 +11,7 @@ import useWebsocket from '~/hooks/useWebsocket';
import { hydrateActivities } from '~/lib/activities';
import api from '~/lib/api';
import useSimulationState from '~/hooks/useSimulationState';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
// TODO (enhancement): rather than invalidating, make optimistic updates to cache value directly
// (i.e. update asteroid name wherever asteroid referenced rather than invalidating large query results)
diff --git a/src/contexts/ChainTransactionContext.js b/src/contexts/ChainTransactionContext.js
index 2fcd3571a..a29dfb713 100644
--- a/src/contexts/ChainTransactionContext.js
+++ b/src/contexts/ChainTransactionContext.js
@@ -5,7 +5,7 @@ import { hash, num, shortString, uint256 } from 'starknet';
import { fetchBuildExecuteTransaction, fetchQuotes } from '@avnu/avnu-sdk';
import * as gasless from '@avnu/gasless-sdk';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import useActivitiesContext from '~/hooks/useActivitiesContext';
import useCrewContext from '~/hooks/useCrewContext';
import useSession from '~/hooks/useSession';
diff --git a/src/contexts/CrewContext.js b/src/contexts/CrewContext.js
index ab78e268f..4061fa926 100644
--- a/src/contexts/CrewContext.js
+++ b/src/contexts/CrewContext.js
@@ -2,7 +2,7 @@ import { createContext, useCallback, useEffect, useMemo, useRef, useState } from
import { useQuery, useQueryClient } from 'react-query';
import { Crewmate, Entity, Permission, Ship, System } from '@influenceth/sdk';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import api from '~/lib/api';
import useSession from '~/hooks/useSession';
import useConstants from '~/hooks/useConstants';
diff --git a/src/contexts/SessionContext.js b/src/contexts/SessionContext.js
index 10d7ed32e..68d283c70 100644
--- a/src/contexts/SessionContext.js
+++ b/src/contexts/SessionContext.js
@@ -18,7 +18,7 @@ import * as gasless from '@avnu/gasless-sdk';
import { getStarkKey, utils } from 'micro-starknet';
import { Address } from '@influenceth/sdk';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import LoginPrompt from '~/components/LoginPrompt';
import Reconnecting from '~/components/Reconnecting';
import api from '~/lib/api';
diff --git a/src/contexts/WebsocketContext.js b/src/contexts/WebsocketContext.js
index 1a1069b20..74ee87677 100644
--- a/src/contexts/WebsocketContext.js
+++ b/src/contexts/WebsocketContext.js
@@ -1,7 +1,7 @@
import { createContext, useCallback, useEffect, useRef, useState } from 'react';
import { io } from 'socket.io-client';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import useSession from '~/hooks/useSession';
const WebsocketContext = createContext();
diff --git a/src/game/Audio.js b/src/game/Audio.js
index 57e4fd0a2..1a4417d14 100644
--- a/src/game/Audio.js
+++ b/src/game/Audio.js
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useRef, useState } from 'react';
import { Howler, Howl } from 'howler';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import useStore from '~/hooks/useStore';
class Sound extends Howl {
diff --git a/src/game/ChatListener.js b/src/game/ChatListener.js
index e3b110359..3398befd1 100644
--- a/src/game/ChatListener.js
+++ b/src/game/ChatListener.js
@@ -1,5 +1,5 @@
import { useCallback, useEffect, useState } from 'react';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import useStore from '~/hooks/useStore';
import useWebsocket from '~/hooks/useWebsocket';
diff --git a/src/game/GpuContextLost.js b/src/game/GpuContextLost.js
index 1378b681d..0d0eaeb5f 100644
--- a/src/game/GpuContextLost.js
+++ b/src/game/GpuContextLost.js
@@ -2,7 +2,7 @@ import { useCallback, useEffect } from 'react';
import { useThree } from '@react-three/fiber';
import styled from 'styled-components';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import useStore from '~/hooks/useStore';
import Button from '~/components/ButtonDumb';
import OnClickLink from '~/components/OnClickLink';
diff --git a/src/game/Interface.js b/src/game/Interface.js
index 7ce56825a..85b589b2a 100644
--- a/src/game/Interface.js
+++ b/src/game/Interface.js
@@ -4,7 +4,7 @@ import { Tooltip } from 'react-tooltip';
import { Switch, Route, Redirect } from 'react-router-dom';
import moment from 'moment';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import { InfluenceIcon, PurchaseAsteroidIcon } from '~/components/Icons';
import useCrewContext from '~/hooks/useCrewContext';
import useScreenSize from '~/hooks/useScreenSize';
diff --git a/src/game/Launcher.js b/src/game/Launcher.js
index 0463dcdda..5a92b7b1d 100644
--- a/src/game/Launcher.js
+++ b/src/game/Launcher.js
@@ -3,7 +3,7 @@ import styled, { css, keyframes } from 'styled-components';
import { PuffLoader as Loader } from 'react-spinners';
import { Tooltip } from 'react-tooltip';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import useSession from '~/hooks/useSession';
import useStore from '~/hooks/useStore';
import {
diff --git a/src/game/interface/MainMenu.js b/src/game/interface/MainMenu.js
index ed2318bf7..0a160101a 100644
--- a/src/game/interface/MainMenu.js
+++ b/src/game/interface/MainMenu.js
@@ -5,7 +5,7 @@ import { MdFullscreen as FullscreenIcon, MdFullscreenExit as ExitFullscreenIcon
import { ResetCameraIcon } from '~/components/Icons';
import screenfull from 'screenfull';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import { BackIcon } from '~/components/Icons';
import PrereleaseLogoSVG from '~/assets/images/logo-prerelease.svg';
import useStore from '~/hooks/useStore';
diff --git a/src/game/interface/RecruitCrewmate.js b/src/game/interface/RecruitCrewmate.js
index a3fff6d69..45e41188d 100644
--- a/src/game/interface/RecruitCrewmate.js
+++ b/src/game/interface/RecruitCrewmate.js
@@ -1,7 +1,7 @@
import { useCallback, useEffect } from 'react';
import { useHistory, useParams } from 'react-router-dom';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import SelectHabitatDialog from '~/components/SelectHabitatDialog';
import SelectUninitializedCrewmateDialog from '~/components/SelectUninitializedCrewmateDialog';
import CrewAssignmentCreate from '~/game/interface/details/crewAssignments/Create';
diff --git a/src/game/interface/details/listViews/actionItems.js b/src/game/interface/details/listViews/actionItems.js
index f88154c1f..b5ccc10bb 100644
--- a/src/game/interface/details/listViews/actionItems.js
+++ b/src/game/interface/details/listViews/actionItems.js
@@ -2,7 +2,7 @@ import { useMemo } from 'react';
import styled from 'styled-components';
import { Lot } from '@influenceth/sdk';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import useSession from '~/hooks/useSession';
import useCrewContext from '~/hooks/useCrewContext';
import { statuses } from '~/lib/actionItem';
diff --git a/src/game/interface/hud/ActionItem.js b/src/game/interface/hud/ActionItem.js
index c62dc8861..1af52a89d 100644
--- a/src/game/interface/hud/ActionItem.js
+++ b/src/game/interface/hud/ActionItem.js
@@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom';
import styled, { css, keyframes } from 'styled-components';
import BarLoader from 'react-spinners/BarLoader';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import { CloseIcon as DismissIcon, EyeIcon } from '~/components/Icons';
import { FailedIcon, RandomEventIcon, ReadyIcon } from '~/components/AnimatedIcons';
import LiveTimer from '~/components/LiveTimer';
diff --git a/src/game/interface/hud/HudMenu.js b/src/game/interface/hud/HudMenu.js
index 65813714e..a27343bd1 100644
--- a/src/game/interface/hud/HudMenu.js
+++ b/src/game/interface/hud/HudMenu.js
@@ -5,7 +5,7 @@ import styled from 'styled-components';
import { Building, Inventory, Lot } from '@influenceth/sdk';
import { BiWrench as WrenchIcon } from 'react-icons/bi';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import IconButton from '~/components/IconButton';
import {
AsteroidSearchIcon,
diff --git a/src/game/interface/hud/TutorialMessage.js b/src/game/interface/hud/TutorialMessage.js
index d238c7123..d081e0d93 100644
--- a/src/game/interface/hud/TutorialMessage.js
+++ b/src/game/interface/hud/TutorialMessage.js
@@ -1,6 +1,6 @@
import styled from 'styled-components';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import Button from '~/components/ButtonAlt';
import ClipCorner from '~/components/ClipCorner';
import IconButton from '~/components/IconButton';
diff --git a/src/game/interface/hud/WelcomeSimulation.js b/src/game/interface/hud/WelcomeSimulation.js
index 0b6fea0a7..7abdf7d06 100644
--- a/src/game/interface/hud/WelcomeSimulation.js
+++ b/src/game/interface/hud/WelcomeSimulation.js
@@ -4,7 +4,7 @@ import { useHistory } from 'react-router-dom';
import styled from 'styled-components';
import Loader from 'react-spinners/PuffLoader';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import { ChevronDoubleDownIcon } from '~/components/Icons';
import { COACHMARK_IDS } from '~/contexts/CoachmarkContext';
import useCoachmarkRefSetter from '~/hooks/useCoachmarkRefSetter';
diff --git a/src/game/interface/hud/actionDialogs/FormAgreement.js b/src/game/interface/hud/actionDialogs/FormAgreement.js
index 3f2d12d0c..69f9852f6 100644
--- a/src/game/interface/hud/actionDialogs/FormAgreement.js
+++ b/src/game/interface/hud/actionDialogs/FormAgreement.js
@@ -4,7 +4,7 @@ import styled from 'styled-components';
import Clipboard from 'react-clipboard.js';
import numeral from 'numeral';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import { CheckIcon, CloseIcon, ExtendAgreementIcon, FormAgreementIcon, FormLotAgreementIcon, GiveNoticeIcon, LinkIcon, CancelAgreementIcon, LotControlIcon, PermissionIcon, RefreshIcon, SwayIcon, WarningOutlineIcon, WarningIcon } from '~/components/Icons';
import useCrewContext from '~/hooks/useCrewContext';
import useStore from '~/hooks/useStore';
diff --git a/src/game/interface/hud/hudMenus/DevTools.js b/src/game/interface/hud/hudMenus/DevTools.js
index 01944eb49..d6ccd837c 100644
--- a/src/game/interface/hud/hudMenus/DevTools.js
+++ b/src/game/interface/hud/hudMenus/DevTools.js
@@ -3,7 +3,7 @@ import styled from 'styled-components';
import { NoToneMapping } from 'three';
import { Building, Product, Ship } from '@influenceth/sdk';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import Button from '~/components/ButtonAlt';
import Dropdown from '~/components/Dropdown';
import IconButton from '~/components/IconButton';
diff --git a/src/game/launcher/Help.js b/src/game/launcher/Help.js
index 6e000c0ef..ba7db8335 100644
--- a/src/game/launcher/Help.js
+++ b/src/game/launcher/Help.js
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react';
import styled from 'styled-components';
import Loader from 'react-spinners/PuffLoader';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import { PlayIcon } from '~/components/Icons';
import LauncherDialog from './components/LauncherDialog';
import SupportMenu from './components/SupportMenu';
diff --git a/src/game/launcher/Rewards.js b/src/game/launcher/Rewards.js
index c6f23cad8..b78a5b44a 100644
--- a/src/game/launcher/Rewards.js
+++ b/src/game/launcher/Rewards.js
@@ -1,4 +1,4 @@
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import LauncherDialog from './components/LauncherDialog';
import RecruitmentMenu from './components/RecruitmentMenu';
import RewardMissions from './components/RewardMissions';
diff --git a/src/game/launcher/components/FundingFlow.js b/src/game/launcher/components/FundingFlow.js
index 4b0e273ab..6a8a8c310 100644
--- a/src/game/launcher/components/FundingFlow.js
+++ b/src/game/launcher/components/FundingFlow.js
@@ -4,7 +4,7 @@ import { createPortal } from 'react-dom';
import { PropagateLoader as Loader } from 'react-spinners';
import { RampInstantSDK } from '@ramp-network/ramp-instant-sdk';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import Button from '~/components/ButtonAlt';
import { ChevronRightIcon, CloseIcon, LinkIcon, WalletIcon } from '~/components/Icons';
import Details from '~/components/DetailsV2';
diff --git a/src/game/launcher/components/RewardMissions.js b/src/game/launcher/components/RewardMissions.js
index a835a1fba..55cc0438e 100644
--- a/src/game/launcher/components/RewardMissions.js
+++ b/src/game/launcher/components/RewardMissions.js
@@ -2,7 +2,7 @@ import { useCallback, useState } from 'react';
import styled from 'styled-components';
import Loader from 'react-spinners/PuffLoader';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import AsteroidsHeroImage from '~/assets/images/sales/asteroids_hero.png';
import AsteroidSurfaceImage from '~/assets/images/hud_headers/Asteroid.png';
import ClipCorner from '~/components/ClipCorner';
diff --git a/src/game/launcher/components/RewardQuests.js b/src/game/launcher/components/RewardQuests.js
index 443acc082..3177dde17 100644
--- a/src/game/launcher/components/RewardQuests.js
+++ b/src/game/launcher/components/RewardQuests.js
@@ -2,7 +2,7 @@ import { useState } from 'react';
import styled from 'styled-components';
import Loader from 'react-spinners/PuffLoader';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import Image1 from '~/assets/images/hud_headers/Asteroid.png';
import Image2 from '~/assets/images/hud_headers/SurfaceShip.png';
import Image3 from '~/assets/images/hud_headers/Building_9.png';
diff --git a/src/game/launcher/components/SKU.js b/src/game/launcher/components/SKU.js
index 5fe955974..a4fd574bd 100644
--- a/src/game/launcher/components/SKU.js
+++ b/src/game/launcher/components/SKU.js
@@ -2,7 +2,7 @@ import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
import { useQueryClient } from 'react-query';
import styled from 'styled-components';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import AsteroidsHeroImage from '~/assets/images/sales/asteroids_hero.png';
import CrewmatesHeroImage from '~/assets/images/sales/crewmates_hero.png';
import SwayImage from '~/assets/images/sales/sway.png';
diff --git a/src/game/launcher/components/SupportMenu.js b/src/game/launcher/components/SupportMenu.js
index 89943944e..75eac8066 100644
--- a/src/game/launcher/components/SupportMenu.js
+++ b/src/game/launcher/components/SupportMenu.js
@@ -1,7 +1,7 @@
import { useCallback } from 'react';
import styled from 'styled-components';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import { ChevronDoubleRightIcon, InfluenceIcon } from '~/components/Icons';
import ClipCorner from '~/components/ClipCorner';
diff --git a/src/game/scene/asteroid/Lots.js b/src/game/scene/asteroid/Lots.js
index 621effb16..b72121ca9 100644
--- a/src/game/scene/asteroid/Lots.js
+++ b/src/game/scene/asteroid/Lots.js
@@ -38,7 +38,7 @@ import theme from '~/theme';
import frag from './shaders/delivery.frag';
import vert from './shaders/delivery.vert';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
const { MAX_LOTS_RENDERED } = constants;
diff --git a/src/gtm.js b/src/gtm.js
index d42bb09a0..1cc31bc77 100644
--- a/src/gtm.js
+++ b/src/gtm.js
@@ -1,6 +1,6 @@
import TagManager from 'react-gtm-module';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
export const initializeTagManager = () => {
if (appConfig.get('Api.ClientId.gtm')) TagManager.initialize({ gtmId: appConfig.get('Api.ClientId.gtm') });
diff --git a/src/hooks/actionManagers/useNftSaleManager.js b/src/hooks/actionManagers/useNftSaleManager.js
index 4cd74bdcb..903e1ef9c 100644
--- a/src/hooks/actionManagers/useNftSaleManager.js
+++ b/src/hooks/actionManagers/useNftSaleManager.js
@@ -1,7 +1,7 @@
import { useCallback, useContext, useMemo } from 'react';
import { Entity } from '@influenceth/sdk';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import ChainTransactionContext from '~/contexts/ChainTransactionContext';
import useCrewContext from '~/hooks/useCrewContext';
diff --git a/src/hooks/useAnnotationContent.js b/src/hooks/useAnnotationContent.js
index 7284dfd77..f1ea598c2 100644
--- a/src/hooks/useAnnotationContent.js
+++ b/src/hooks/useAnnotationContent.js
@@ -1,7 +1,7 @@
import axios from 'axios';
import { useQuery } from 'react-query';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
const useAnnotationContent = (annotation) => {
const hash = annotation?.ipfs?.hash;
diff --git a/src/hooks/useBookTokens.js b/src/hooks/useBookTokens.js
index 1292a7245..eb483ce33 100644
--- a/src/hooks/useBookTokens.js
+++ b/src/hooks/useBookTokens.js
@@ -1,6 +1,6 @@
import { useMemo } from 'react';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import useCrewContext from '~/hooks/useCrewContext';
import { useSwayBalance } from '~/hooks/useWalletTokenBalance';
import formatters from '~/lib/formatters';
diff --git a/src/hooks/useGetActivityConfig.js b/src/hooks/useGetActivityConfig.js
index 6e4b51321..961680eea 100644
--- a/src/hooks/useGetActivityConfig.js
+++ b/src/hooks/useGetActivityConfig.js
@@ -1,7 +1,7 @@
import { useMemo } from 'react';
import { useQueryClient } from 'react-query';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import useCrewContext from '~/hooks/useCrewContext';
import activities, { getHydrationQueryKey } from '~/lib/activities';
diff --git a/src/hooks/useStore.js b/src/hooks/useStore.js
index a0b3004d8..cb4c88919 100644
--- a/src/hooks/useStore.js
+++ b/src/hooks/useStore.js
@@ -9,7 +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';
+import { appConfig } from '~/appConfig';
export const STORE_NAME = 'influence';
diff --git a/src/hooks/useSwapHelper.js b/src/hooks/useSwapHelper.js
index 5410630b7..cccb9f84d 100644
--- a/src/hooks/useSwapHelper.js
+++ b/src/hooks/useSwapHelper.js
@@ -1,7 +1,7 @@
import { useCallback, useMemo } from 'react';
import { fetchBuildExecuteTransaction } from '@avnu/avnu-sdk';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import useStore from '~/hooks/useStore';
import useWalletPurchasableBalances from '~/hooks/useWalletPurchasableBalances';
import { TOKEN } from '~/lib/priceUtils';
diff --git a/src/hooks/useTutorialSteps.js b/src/hooks/useTutorialSteps.js
index 88e535b84..230bfa6b7 100644
--- a/src/hooks/useTutorialSteps.js
+++ b/src/hooks/useTutorialSteps.js
@@ -2,7 +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 { appConfig } from '~/appConfig';
import useCrewAgreements from '~/hooks/useCrewAgreements';
import useCrewBuildings from '~/hooks/useCrewBuildings';
import useCrewContext from '~/hooks/useCrewContext';
diff --git a/src/lib/activities.js b/src/lib/activities.js
index fa03071b2..a4a991102 100644
--- a/src/lib/activities.js
+++ b/src/lib/activities.js
@@ -2,7 +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 { appConfig } from '~/appConfig';
import AddressLink from '~/components/AddressLink';
import EntityLink from '~/components/EntityLink';
import {
diff --git a/src/lib/api.js b/src/lib/api.js
index bbdbd291d..aadb4bec8 100644
--- a/src/lib/api.js
+++ b/src/lib/api.js
@@ -3,7 +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 { appConfig } from '~/appConfig';
import useStore from '~/hooks/useStore';
import { entityToAgreements, esbLocationQuery, esbPermissionQuery, safeBigInt, safeEntityId } from './utils';
import { TOKEN, TOKEN_SCALE } from './priceUtils';
diff --git a/src/lib/assetUtils.js b/src/lib/assetUtils.js
index 0afa93358..b34845616 100644
--- a/src/lib/assetUtils.js
+++ b/src/lib/assetUtils.js
@@ -1,6 +1,6 @@
import { Assets, Building, Product, Ship } from '@influenceth/sdk';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
const ASSET_CACHE = {};
diff --git a/src/lib/cacheKey.js b/src/lib/cacheKey.js
index 5787b5477..b3257b2b2 100644
--- a/src/lib/cacheKey.js
+++ b/src/lib/cacheKey.js
@@ -1,5 +1,5 @@
import { Entity } from '@influenceth/sdk';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
/* CACHE KEY DICTIONARY
non-entity based
diff --git a/src/lib/getAlertContent.js b/src/lib/getAlertContent.js
index 4dca89555..814d7f1fb 100644
--- a/src/lib/getAlertContent.js
+++ b/src/lib/getAlertContent.js
@@ -1,4 +1,4 @@
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import { UpdateIcon, WarningIcon, SettingsIcon, WalletIcon, ClipboardIcon } from '~/components/Icons';
const entries = {
diff --git a/src/lib/priceUtils.js b/src/lib/priceUtils.js
index 746d7a4a2..1ea534bd5 100644
--- a/src/lib/priceUtils.js
+++ b/src/lib/priceUtils.js
@@ -1,6 +1,6 @@
import { Address } from '@influenceth/sdk';
-import appConfig from '~/appConfig';
+import { appConfig } from '~/appConfig';
import { EthIcon, SwayIcon } from '~/components/Icons';
import { safeBigInt } from './utils';
diff --git a/src/lib/utils.js b/src/lib/utils.js
index c110ec7ce..c2db31894 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -3,7 +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 { appConfig } from '~/appConfig';
import { ManufactureIcon, GrowIcon, AssembleIcon, RefineIcon } from '~/components/Icons';
import { TOKEN, TOKEN_SCALE } from './priceUtils';
diff --git a/src/simulation/useSimulationSteps.js b/src/simulation/useSimulationSteps.js
index e64dab0c0..5366f3002 100644
--- a/src/simulation/useSimulationSteps.js
+++ b/src/simulation/useSimulationSteps.js
@@ -3,7 +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 { 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';
From fcf7f2e997f8f48bfddb2cc8c0d48e9f64ad4d7b Mon Sep 17 00:00:00 2001
From: Patrick Keenum <5631043+prof197@users.noreply.github.com>
Date: Thu, 26 Sep 2024 15:20:00 -0400
Subject: [PATCH 3/9] fixes
---
src/game/interface/details/crewAssignments/Complete.js | 2 +-
src/game/interface/details/crewAssignments/Create.js | 2 +-
src/game/interface/hud/HudMenu.js | 2 +-
src/game/interface/hud/hudMenus/DevTools.js | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/game/interface/details/crewAssignments/Complete.js b/src/game/interface/details/crewAssignments/Complete.js
index 6ba994c40..df7823186 100644
--- a/src/game/interface/details/crewAssignments/Complete.js
+++ b/src/game/interface/details/crewAssignments/Complete.js
@@ -383,7 +383,7 @@
//
//
-// {!appConfig.get('hideSocial') && (
+// {!appConfig.get('App.hideSocial') && (
//
// Share on Twitter
//
- {!appConfig.get('hideSocial') && (
+ {!appConfig.get('App.hideSocial') && (
Share on Twitter
From ae46bde33295608114b360676c019ed39e68fcb0 Mon Sep 17 00:00:00 2001
From: Patrick Keenum <5631043+prof197@users.noreply.github.com>
Date: Thu, 26 Sep 2024 15:46:36 -0400
Subject: [PATCH 4/9] force re-deploy
---
src/hooks/useWebWorker.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
From 3a8e65a8fc4d29bcfc3356f288cc8a715233aae2 Mon Sep 17 00:00:00 2001
From: Patrick Keenum <5631043+prof197@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:04:42 -0400
Subject: [PATCH 5/9] update app.json to match pruned env requirements
---
app.json | 119 +++++--------------------------------------------------
1 file changed, 10 insertions(+), 109 deletions(-)
diff --git a/app.json b/app.json
index 228a35433..77036136b 100644
--- a/app.json
+++ b/app.json
@@ -6,123 +6,24 @@
}
],
"env": {
- "REACT_APP_DEPLOYMENT": {
- "description": "The specific deployment tag for the client (i.e. prerelease, production, etc.)",
- "required": true
- },
- "REACT_APP_API_URL": {
- "description": "Base URL of the Influence API server, does not include trailing slash",
- "required": true
- },
- "REACT_APP_IMAGES_URL": {
- "description": "Base URL of the Influence images server, does not include trailing slash",
- "required": true
- },
- "REACT_APP_BRIDGE_URL": {
- "description": "Base URL of the Influence L1/L2 bridge",
- "required": true
- },
- "REACT_APP_ETHEREUM_NFT_MARKET_URL": {
- "description": "Base URL for Ethereum NFT marketplace. Does not include trailing slash",
- "required": true
- },
- "REACT_APP_STARKNET_NFT_MARKET_URL": {
- "description": "Base URL for Starknet NFT marketplace. Does not include trailing slash",
- "required": true
- },
- "REACT_APP_CHAIN_ID": {
- "description": "Chain ID for Starknet (i.e. 0x534e5f474f45524c49 for Testnet)",
- "required": true
- },
- "REACT_APP_STARKNET_NETWORK": {
- "description": "Base URL for Starknet network.",
- "required": true
- },
- "REACT_APP_ETHEREUM_EXPLORER_URL": {
- "description": "Base URL for Ethereum block explorer. Does not include trailing slash",
- "required": true
- },
- "REACT_APP_STARKNET_EXPLORER_URL": {
- "description": "Base URL for Starknet block explorer. Does not include trailing slash",
- "required": true
- },
- "REACT_APP_ERC20_TOKEN_ADDRESS": {
- "description": "Address of ERC20 token for network.",
- "required": true
- },
- "REACT_APP_STARKNET_DISPATCHER": {
- "required": true
- },
- "REACT_APP_STARKNET_ESCROW": {
- "required": true
- },
- "REACT_APP_STARKNET_ASTEROID_TOKEN": {
- "required": true
- },
- "REACT_APP_STARKNET_CREWMATE_TOKEN": {
- "required": true
- },
- "REACT_APP_STARKNET_SHIP_TOKEN": {
- "required": true
- },
- "REACT_APP_CONTRACT_ASTEROID_TOKEN": {
- "description": "Address of Asteroid token on L1",
- "required": true
- },
- "REACT_APP_CONTRACT_CREWMATE_TOKEN": {
- "description": "Address of Crewmate token on L1",
- "required": true
- },
- "REACT_APP_CONTRACT_CREWMATE_TOKEN_V2": {
- "description": "Address of Crewmate v2 token on L1",
- "required": true
- },
- "REACT_APP_ENABLE_DEV_TOOLS": {
+ "REACT_APP_API_CLIENTID_GTM": {
+ "description": "Google Tag Manager ID (optional)",
"required": false
},
- "REACT_APP_HIDE_SOCIAL": {
+ "REACT_APP_API_CLIENTID_GOOGLE": {
+ "description": "Google API Key (optional)",
"required": false
},
- "REACT_APP_CLOUDFRONT_IMAGE_URL": {
- "required": true
- },
- "REACT_APP_CLOUDFRONT_OTHER_URL": {
- "required": true
- },
- "REACT_APP_CLOUDFRONT_BUCKET": {
- "required": true
- },
- "REACT_APP_HELP_URL": {
- "required": false
- },
- "REACT_APP_LAYERSWAP_CLIENT_ID": {
- "required": false
- },
- "REACT_APP_RAMP_API_KEY": {
- "required": false
- },
- "REACT_APP_ARGENT_WEB_WALLET_URL": {
- "required": false
- },
- "REACT_APP_STARKNET_SWAY_TOKEN": {
- "required": true
- },
- "REACT_APP_AVNU_API_URL": {
- "required": false
- },
- "REACT_APP_IPFS_URL": {
- "required": true
- },
- "REACT_APP_GOOGLE_API_KEY": {
- "required": true
- },
- "REACT_APP_SOCIAL_QUESTS_URL": {
+ "REACT_APP_API_CLIENTID_LAYERSWAP": {
+ "description": "Layerswap Client ID (optional)",
"required": false
},
- "REACT_APP_COLONIZATION_MISSIONS_URL": {
+ "REACT_APP_API_CLIENTID_RAMP": {
+ "description": "Ramp API Key (optional)",
"required": false
},
- "REACT_APP_COMMUNITY_MISSIONS_URL": {
+ "REACT_APP_STARKNET_PROVIDER": {
+ "description": "Custom Starknet rpc provider (optional)",
"required": false
}
}
From 110fd09e80162bae9e8a59e1d0431715651c95c9 Mon Sep 17 00:00:00 2001
From: Patrick Keenum <5631043+prof197@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:22:35 -0400
Subject: [PATCH 6/9] debug
---
src/appConfig/_default.json | 2 +-
src/appConfig/index.js | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/appConfig/_default.json b/src/appConfig/_default.json
index 21ee0fc7c..17770b712 100644
--- a/src/appConfig/_default.json
+++ b/src/appConfig/_default.json
@@ -61,7 +61,7 @@
"ethereumNftMarket": "",
"help": "https://discord.gg/influenceth",
"home": "https://influence.io",
- "socialQuests": "https://starknet.quest/quest/32",
+ "socialQuests": "",
"starknetExplorer": "",
"starknetNftMarket": "",
"wiki": "https://wiki.influenceth.io"
diff --git a/src/appConfig/index.js b/src/appConfig/index.js
index 61edc2cfb..913125f9d 100644
--- a/src/appConfig/index.js
+++ b/src/appConfig/index.js
@@ -10,6 +10,7 @@ import productionConfig from './production.json';
// - any value can be overridden by an environment variable... for example, to overwrite
// 'Api.ClientId.layerswap', you would set `REACT_APP_API_CLIENTID_LAYERSWAP` in your env
+console.log('process.env.NODE_ENV', process.env.NODE_ENV, process.env);
function flattenObject(obj, parentKey = '', result = {}) {
return reduce(obj, (res, value, key) => {
From ccf20ef764fde2a39423e4e75d53b647f7adb9f4 Mon Sep 17 00:00:00 2001
From: Patrick Keenum <5631043+prof197@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:47:20 -0400
Subject: [PATCH 7/9] add REACT_APP_CONFIG_ENV
---
app.json | 4 ++++
src/appConfig/index.js | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/app.json b/app.json
index 77036136b..38c6e7de5 100644
--- a/app.json
+++ b/app.json
@@ -6,6 +6,10 @@
}
],
"env": {
+ "REACT_APP_CONFIG_ENV": {
+ "description": "Override NODE_ENV in choosing which config to use (optional)",
+ "required": false
+ },
"REACT_APP_API_CLIENTID_GTM": {
"description": "Google Tag Manager ID (optional)",
"required": false
diff --git a/src/appConfig/index.js b/src/appConfig/index.js
index 913125f9d..5134c5f59 100644
--- a/src/appConfig/index.js
+++ b/src/appConfig/index.js
@@ -25,9 +25,11 @@ function flattenObject(obj, parentKey = '', result = {}) {
}
// override default config with environment specific config
+const configSelection = process.env.REACT_APP_CONFIG_ENV || process.env.NODE_ENV;
+console.log('configSelection', configSelection);
const rawConfig = {
...flattenObject(defaultConfig),
- ...flattenObject((process.env.NODE_ENV === 'production' ? productionConfig : prereleaseConfig)),
+ ...flattenObject(configSelection === 'production' ? productionConfig : prereleaseConfig),
};
// override config with environment variables
From d9c3b2247ab48466efe76af3279b731865493432 Mon Sep 17 00:00:00 2001
From: Patrick Keenum <5631043+prof197@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:50:05 -0400
Subject: [PATCH 8/9] remove logs
---
README.md | 3 ++-
src/appConfig/index.js | 3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 8148f3835..eebe8cc68 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,8 @@ The browser game client for Influence.
echo "BUFFER_GLOBAL=1
SKIP_PREFLIGHT_CHECK=1
- NODE_ENV=prerelease
+ NODE_ENV=development
+ REACT_APP_CONFIG_ENV=prerelease
REACT_APP_APP_VERBOSELOGS=1" > .env
```
1. Adjust or fill in any missing .env variables as needed. Most values are preset in
diff --git a/src/appConfig/index.js b/src/appConfig/index.js
index 5134c5f59..7946b5d28 100644
--- a/src/appConfig/index.js
+++ b/src/appConfig/index.js
@@ -10,8 +10,6 @@ import productionConfig from './production.json';
// - any value can be overridden by an environment variable... for example, to overwrite
// 'Api.ClientId.layerswap', you would set `REACT_APP_API_CLIENTID_LAYERSWAP` in your env
-console.log('process.env.NODE_ENV', process.env.NODE_ENV, process.env);
-
function flattenObject(obj, parentKey = '', result = {}) {
return reduce(obj, (res, value, key) => {
const newKey = parentKey ? `${parentKey}.${key}` : key;
@@ -26,7 +24,6 @@ function flattenObject(obj, parentKey = '', result = {}) {
// override default config with environment specific config
const configSelection = process.env.REACT_APP_CONFIG_ENV || process.env.NODE_ENV;
-console.log('configSelection', configSelection);
const rawConfig = {
...flattenObject(defaultConfig),
...flattenObject(configSelection === 'production' ? productionConfig : prereleaseConfig),
From 356d9cc4e1b1e9a2435664ad0cac992557160c79 Mon Sep 17 00:00:00 2001
From: Patrick Keenum <5631043+prof197@users.noreply.github.com>
Date: Fri, 4 Oct 2024 12:44:03 -0400
Subject: [PATCH 9/9] age verification before purchase
---
src/components/BrightButton.js | 4 +--
src/game/launcher/store/FundingFlow.js | 39 ++++++++++++++++++++++++--
src/hooks/useStore.js | 5 ++++
3 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/src/components/BrightButton.js b/src/components/BrightButton.js
index 1cdcd20b9..9282a8a56 100644
--- a/src/components/BrightButton.js
+++ b/src/components/BrightButton.js
@@ -89,13 +89,13 @@ const Loader = styled.div`
`}
`;
-const BrightButton = ({ attention, children, loading, ...props }) => {
+const BrightButton = ({ attention, children, loading, innerProps = {}, ...props }) => {
return (
<>
{attention &&
+ {!ageVerified && (
+
+ You must be over 18 years or older to make a purchase.
+ dispatchAgeVerified()}
+ success>
+
+
+ )}
-
+
diff --git a/src/hooks/useStore.js b/src/hooks/useStore.js
index cb4c88919..504ea5b9f 100644
--- a/src/hooks/useStore.js
+++ b/src/hooks/useStore.js
@@ -50,6 +50,7 @@ const simulationStateDefault = {
const useStore = create(subscribeWithSelector(persist((set, get) => ({
actionDialog: {},
+ ageVerified: false,
launcherPage: null,
launcherSubpage: null,
openHudMenu: null,
@@ -767,6 +768,10 @@ const useStore = create(subscribeWithSelector(persist((set, get) => ({
}
})),
+ dispatchAgeVerified: () => set(produce(state => {
+ state.ageVerified = true;
+ })),
+
//
// SPECIAL GETTERS
{quest.icon}
@@ -217,7 +218,7 @@ const RewardQuests = () => {
{isLaunched && !error && !loading && (
<>
- 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 }, } From f6b558d90d5e3529bdbf350c687a0d15ceb60252 Mon Sep 17 00:00:00 2001 From: Patrick Keenum <5631043+prof197@users.noreply.github.com> Date: Thu, 26 Sep 2024 14:31:06 -0400 Subject: [PATCH 2/9] fix for opengraph stuff (hopefully) --- opengraph.js | 4 ++-- src/Game.js | 2 +- src/ScreensizeWarning.js | 2 +- src/appConfig/index.js | 14 ++++++++------ src/components/BridgeModalDialog.js | 2 +- src/components/CrewmateCard.js | 2 +- src/components/MarketplaceLink.js | 2 +- src/contexts/ActivitiesContext.js | 2 +- src/contexts/ChainTransactionContext.js | 2 +- src/contexts/CrewContext.js | 2 +- src/contexts/SessionContext.js | 2 +- src/contexts/WebsocketContext.js | 2 +- src/game/Audio.js | 2 +- src/game/ChatListener.js | 2 +- src/game/GpuContextLost.js | 2 +- src/game/Interface.js | 2 +- src/game/Launcher.js | 2 +- src/game/interface/MainMenu.js | 2 +- src/game/interface/RecruitCrewmate.js | 2 +- .../interface/details/listViews/actionItems.js | 2 +- src/game/interface/hud/ActionItem.js | 2 +- src/game/interface/hud/HudMenu.js | 2 +- src/game/interface/hud/TutorialMessage.js | 2 +- src/game/interface/hud/WelcomeSimulation.js | 2 +- .../interface/hud/actionDialogs/FormAgreement.js | 2 +- src/game/interface/hud/hudMenus/DevTools.js | 2 +- src/game/launcher/Help.js | 2 +- src/game/launcher/Rewards.js | 2 +- src/game/launcher/components/FundingFlow.js | 2 +- src/game/launcher/components/RewardMissions.js | 2 +- src/game/launcher/components/RewardQuests.js | 2 +- src/game/launcher/components/SKU.js | 2 +- src/game/launcher/components/SupportMenu.js | 2 +- src/game/scene/asteroid/Lots.js | 2 +- src/gtm.js | 2 +- src/hooks/actionManagers/useNftSaleManager.js | 2 +- src/hooks/useAnnotationContent.js | 2 +- src/hooks/useBookTokens.js | 2 +- src/hooks/useGetActivityConfig.js | 2 +- src/hooks/useStore.js | 2 +- src/hooks/useSwapHelper.js | 2 +- src/hooks/useTutorialSteps.js | 2 +- src/lib/activities.js | 2 +- src/lib/api.js | 2 +- src/lib/assetUtils.js | 2 +- src/lib/cacheKey.js | 2 +- src/lib/getAlertContent.js | 2 +- src/lib/priceUtils.js | 2 +- src/lib/utils.js | 2 +- src/simulation/useSimulationSteps.js | 2 +- 50 files changed, 58 insertions(+), 56 deletions(-) diff --git a/opengraph.js b/opengraph.js index 64b2b3c5d..dd01d49c9 100644 --- a/opengraph.js +++ b/opengraph.js @@ -1,9 +1,9 @@ const axios = require('axios'); const probe = require('probe-image-size'); -const appConfig = require('./src/appConfig'); +const { appConfig } = require('./src/appConfig'); -const instance = axios.create({ baseURL: `${appConfig.get('Api.influence')}/og/data` }); +const instance = axios.create({ baseURL: `${appConfig.get('Api.influence')}/og/data?t=1` }); const getOpengraphTags = async (originalUrl) => { const urlParts = originalUrl.split('/').slice(1); diff --git a/src/Game.js b/src/Game.js index f13fecd41..c01643ae1 100644 --- a/src/Game.js +++ b/src/Game.js @@ -6,7 +6,7 @@ import { useDetectGPU } from '@react-three/drei'; import { initializeTagManager } from './gtm'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import FullpageInterstitial from '~/components/FullpageInterstitial'; import { ActionItemProvider } from '~/contexts/ActionItemContext'; import { ActivitiesProvider } from '~/contexts/ActivitiesContext'; diff --git a/src/ScreensizeWarning.js b/src/ScreensizeWarning.js index 657fb622f..55890b0a2 100644 --- a/src/ScreensizeWarning.js +++ b/src/ScreensizeWarning.js @@ -1,6 +1,6 @@ import { useState } from 'react'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import FullpageInterstitial from '~/components/FullpageInterstitial'; import useScreenSize from '~/hooks/useScreenSize'; import theme from '~/theme'; diff --git a/src/appConfig/index.js b/src/appConfig/index.js index 88e8dbc89..61edc2cfb 100644 --- a/src/appConfig/index.js +++ b/src/appConfig/index.js @@ -30,7 +30,7 @@ const rawConfig = { }; // override config with environment variables -const appConfig = reduce( +const appConfigData = reduce( rawConfig, (res, v, key) => { const overrideKey = `REACT_APP_${key.replace(/\./g, '_').toUpperCase()}`; @@ -42,10 +42,12 @@ const appConfig = reduce( rawConfig ); -export default { +const appConfig = { get: (key) => { - if (!appConfig.hasOwnProperty(key)) throw new Error(`Invalid appConfig key: "${key}"`); - return appConfig[key]; + if (!appConfigData.hasOwnProperty(key)) throw new Error(`Invalid appConfig key: "${key}"`); + return appConfigData[key]; }, - has: (key) => appConfig.hasOwnProperty(key), -}; \ No newline at end of file + has: (key) => appConfigData.hasOwnProperty(key), +}; + +export { appConfig }; diff --git a/src/components/BridgeModalDialog.js b/src/components/BridgeModalDialog.js index 89ad42d70..f99f0fa2b 100644 --- a/src/components/BridgeModalDialog.js +++ b/src/components/BridgeModalDialog.js @@ -1,7 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import BrightButton from '~/components/BrightButton'; import IconButton from '~/components/IconButton'; import { CloseIcon } from '~/components/Icons'; diff --git a/src/components/CrewmateCard.js b/src/components/CrewmateCard.js index 3f20e001f..62e5cf333 100644 --- a/src/components/CrewmateCard.js +++ b/src/components/CrewmateCard.js @@ -4,7 +4,7 @@ import styled, { css } from 'styled-components'; import pick from 'lodash/pick'; import { Crewmate } from '@influenceth/sdk'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import silhouette from '~/assets/images/silhouette.png'; import CrewmateCardOverlay, { cardTransitionSpeed, cardTransitionFunction } from '~/components/CrewmateCardOverlay'; import CrewClassIcon from '~/components/CrewClassIcon'; diff --git a/src/components/MarketplaceLink.js b/src/components/MarketplaceLink.js index e81f9a96d..6f50a813a 100644 --- a/src/components/MarketplaceLink.js +++ b/src/components/MarketplaceLink.js @@ -1,6 +1,6 @@ import { useCallback, useState, } from 'react'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; const MarketplaceLink = ({ assetType, chain, children, id }) => { const [referenceEl, setReferenceEl] = useState(); diff --git a/src/contexts/ActivitiesContext.js b/src/contexts/ActivitiesContext.js index 721e054c1..af0ab6b99 100644 --- a/src/contexts/ActivitiesContext.js +++ b/src/contexts/ActivitiesContext.js @@ -11,7 +11,7 @@ import useWebsocket from '~/hooks/useWebsocket'; import { hydrateActivities } from '~/lib/activities'; import api from '~/lib/api'; import useSimulationState from '~/hooks/useSimulationState'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; // TODO (enhancement): rather than invalidating, make optimistic updates to cache value directly // (i.e. update asteroid name wherever asteroid referenced rather than invalidating large query results) diff --git a/src/contexts/ChainTransactionContext.js b/src/contexts/ChainTransactionContext.js index 2fcd3571a..a29dfb713 100644 --- a/src/contexts/ChainTransactionContext.js +++ b/src/contexts/ChainTransactionContext.js @@ -5,7 +5,7 @@ import { hash, num, shortString, uint256 } from 'starknet'; import { fetchBuildExecuteTransaction, fetchQuotes } from '@avnu/avnu-sdk'; import * as gasless from '@avnu/gasless-sdk'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import useActivitiesContext from '~/hooks/useActivitiesContext'; import useCrewContext from '~/hooks/useCrewContext'; import useSession from '~/hooks/useSession'; diff --git a/src/contexts/CrewContext.js b/src/contexts/CrewContext.js index ab78e268f..4061fa926 100644 --- a/src/contexts/CrewContext.js +++ b/src/contexts/CrewContext.js @@ -2,7 +2,7 @@ import { createContext, useCallback, useEffect, useMemo, useRef, useState } from import { useQuery, useQueryClient } from 'react-query'; import { Crewmate, Entity, Permission, Ship, System } from '@influenceth/sdk'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import api from '~/lib/api'; import useSession from '~/hooks/useSession'; import useConstants from '~/hooks/useConstants'; diff --git a/src/contexts/SessionContext.js b/src/contexts/SessionContext.js index 10d7ed32e..68d283c70 100644 --- a/src/contexts/SessionContext.js +++ b/src/contexts/SessionContext.js @@ -18,7 +18,7 @@ import * as gasless from '@avnu/gasless-sdk'; import { getStarkKey, utils } from 'micro-starknet'; import { Address } from '@influenceth/sdk'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import LoginPrompt from '~/components/LoginPrompt'; import Reconnecting from '~/components/Reconnecting'; import api from '~/lib/api'; diff --git a/src/contexts/WebsocketContext.js b/src/contexts/WebsocketContext.js index 1a1069b20..74ee87677 100644 --- a/src/contexts/WebsocketContext.js +++ b/src/contexts/WebsocketContext.js @@ -1,7 +1,7 @@ import { createContext, useCallback, useEffect, useRef, useState } from 'react'; import { io } from 'socket.io-client'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import useSession from '~/hooks/useSession'; const WebsocketContext = createContext(); diff --git a/src/game/Audio.js b/src/game/Audio.js index 57e4fd0a2..1a4417d14 100644 --- a/src/game/Audio.js +++ b/src/game/Audio.js @@ -1,7 +1,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'; import { Howler, Howl } from 'howler'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import useStore from '~/hooks/useStore'; class Sound extends Howl { diff --git a/src/game/ChatListener.js b/src/game/ChatListener.js index e3b110359..3398befd1 100644 --- a/src/game/ChatListener.js +++ b/src/game/ChatListener.js @@ -1,5 +1,5 @@ import { useCallback, useEffect, useState } from 'react'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import useStore from '~/hooks/useStore'; import useWebsocket from '~/hooks/useWebsocket'; diff --git a/src/game/GpuContextLost.js b/src/game/GpuContextLost.js index 1378b681d..0d0eaeb5f 100644 --- a/src/game/GpuContextLost.js +++ b/src/game/GpuContextLost.js @@ -2,7 +2,7 @@ import { useCallback, useEffect } from 'react'; import { useThree } from '@react-three/fiber'; import styled from 'styled-components'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import useStore from '~/hooks/useStore'; import Button from '~/components/ButtonDumb'; import OnClickLink from '~/components/OnClickLink'; diff --git a/src/game/Interface.js b/src/game/Interface.js index 7ce56825a..85b589b2a 100644 --- a/src/game/Interface.js +++ b/src/game/Interface.js @@ -4,7 +4,7 @@ import { Tooltip } from 'react-tooltip'; import { Switch, Route, Redirect } from 'react-router-dom'; import moment from 'moment'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import { InfluenceIcon, PurchaseAsteroidIcon } from '~/components/Icons'; import useCrewContext from '~/hooks/useCrewContext'; import useScreenSize from '~/hooks/useScreenSize'; diff --git a/src/game/Launcher.js b/src/game/Launcher.js index 0463dcdda..5a92b7b1d 100644 --- a/src/game/Launcher.js +++ b/src/game/Launcher.js @@ -3,7 +3,7 @@ import styled, { css, keyframes } from 'styled-components'; import { PuffLoader as Loader } from 'react-spinners'; import { Tooltip } from 'react-tooltip'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import useSession from '~/hooks/useSession'; import useStore from '~/hooks/useStore'; import { diff --git a/src/game/interface/MainMenu.js b/src/game/interface/MainMenu.js index ed2318bf7..0a160101a 100644 --- a/src/game/interface/MainMenu.js +++ b/src/game/interface/MainMenu.js @@ -5,7 +5,7 @@ import { MdFullscreen as FullscreenIcon, MdFullscreenExit as ExitFullscreenIcon import { ResetCameraIcon } from '~/components/Icons'; import screenfull from 'screenfull'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import { BackIcon } from '~/components/Icons'; import PrereleaseLogoSVG from '~/assets/images/logo-prerelease.svg'; import useStore from '~/hooks/useStore'; diff --git a/src/game/interface/RecruitCrewmate.js b/src/game/interface/RecruitCrewmate.js index a3fff6d69..45e41188d 100644 --- a/src/game/interface/RecruitCrewmate.js +++ b/src/game/interface/RecruitCrewmate.js @@ -1,7 +1,7 @@ import { useCallback, useEffect } from 'react'; import { useHistory, useParams } from 'react-router-dom'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import SelectHabitatDialog from '~/components/SelectHabitatDialog'; import SelectUninitializedCrewmateDialog from '~/components/SelectUninitializedCrewmateDialog'; import CrewAssignmentCreate from '~/game/interface/details/crewAssignments/Create'; diff --git a/src/game/interface/details/listViews/actionItems.js b/src/game/interface/details/listViews/actionItems.js index f88154c1f..b5ccc10bb 100644 --- a/src/game/interface/details/listViews/actionItems.js +++ b/src/game/interface/details/listViews/actionItems.js @@ -2,7 +2,7 @@ import { useMemo } from 'react'; import styled from 'styled-components'; import { Lot } from '@influenceth/sdk'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import useSession from '~/hooks/useSession'; import useCrewContext from '~/hooks/useCrewContext'; import { statuses } from '~/lib/actionItem'; diff --git a/src/game/interface/hud/ActionItem.js b/src/game/interface/hud/ActionItem.js index c62dc8861..1af52a89d 100644 --- a/src/game/interface/hud/ActionItem.js +++ b/src/game/interface/hud/ActionItem.js @@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom'; import styled, { css, keyframes } from 'styled-components'; import BarLoader from 'react-spinners/BarLoader'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import { CloseIcon as DismissIcon, EyeIcon } from '~/components/Icons'; import { FailedIcon, RandomEventIcon, ReadyIcon } from '~/components/AnimatedIcons'; import LiveTimer from '~/components/LiveTimer'; diff --git a/src/game/interface/hud/HudMenu.js b/src/game/interface/hud/HudMenu.js index 65813714e..a27343bd1 100644 --- a/src/game/interface/hud/HudMenu.js +++ b/src/game/interface/hud/HudMenu.js @@ -5,7 +5,7 @@ import styled from 'styled-components'; import { Building, Inventory, Lot } from '@influenceth/sdk'; import { BiWrench as WrenchIcon } from 'react-icons/bi'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import IconButton from '~/components/IconButton'; import { AsteroidSearchIcon, diff --git a/src/game/interface/hud/TutorialMessage.js b/src/game/interface/hud/TutorialMessage.js index d238c7123..d081e0d93 100644 --- a/src/game/interface/hud/TutorialMessage.js +++ b/src/game/interface/hud/TutorialMessage.js @@ -1,6 +1,6 @@ import styled from 'styled-components'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import Button from '~/components/ButtonAlt'; import ClipCorner from '~/components/ClipCorner'; import IconButton from '~/components/IconButton'; diff --git a/src/game/interface/hud/WelcomeSimulation.js b/src/game/interface/hud/WelcomeSimulation.js index 0b6fea0a7..7abdf7d06 100644 --- a/src/game/interface/hud/WelcomeSimulation.js +++ b/src/game/interface/hud/WelcomeSimulation.js @@ -4,7 +4,7 @@ import { useHistory } from 'react-router-dom'; import styled from 'styled-components'; import Loader from 'react-spinners/PuffLoader'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import { ChevronDoubleDownIcon } from '~/components/Icons'; import { COACHMARK_IDS } from '~/contexts/CoachmarkContext'; import useCoachmarkRefSetter from '~/hooks/useCoachmarkRefSetter'; diff --git a/src/game/interface/hud/actionDialogs/FormAgreement.js b/src/game/interface/hud/actionDialogs/FormAgreement.js index 3f2d12d0c..69f9852f6 100644 --- a/src/game/interface/hud/actionDialogs/FormAgreement.js +++ b/src/game/interface/hud/actionDialogs/FormAgreement.js @@ -4,7 +4,7 @@ import styled from 'styled-components'; import Clipboard from 'react-clipboard.js'; import numeral from 'numeral'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import { CheckIcon, CloseIcon, ExtendAgreementIcon, FormAgreementIcon, FormLotAgreementIcon, GiveNoticeIcon, LinkIcon, CancelAgreementIcon, LotControlIcon, PermissionIcon, RefreshIcon, SwayIcon, WarningOutlineIcon, WarningIcon } from '~/components/Icons'; import useCrewContext from '~/hooks/useCrewContext'; import useStore from '~/hooks/useStore'; diff --git a/src/game/interface/hud/hudMenus/DevTools.js b/src/game/interface/hud/hudMenus/DevTools.js index 01944eb49..d6ccd837c 100644 --- a/src/game/interface/hud/hudMenus/DevTools.js +++ b/src/game/interface/hud/hudMenus/DevTools.js @@ -3,7 +3,7 @@ import styled from 'styled-components'; import { NoToneMapping } from 'three'; import { Building, Product, Ship } from '@influenceth/sdk'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import Button from '~/components/ButtonAlt'; import Dropdown from '~/components/Dropdown'; import IconButton from '~/components/IconButton'; diff --git a/src/game/launcher/Help.js b/src/game/launcher/Help.js index 6e000c0ef..ba7db8335 100644 --- a/src/game/launcher/Help.js +++ b/src/game/launcher/Help.js @@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react'; import styled from 'styled-components'; import Loader from 'react-spinners/PuffLoader'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import { PlayIcon } from '~/components/Icons'; import LauncherDialog from './components/LauncherDialog'; import SupportMenu from './components/SupportMenu'; diff --git a/src/game/launcher/Rewards.js b/src/game/launcher/Rewards.js index c6f23cad8..b78a5b44a 100644 --- a/src/game/launcher/Rewards.js +++ b/src/game/launcher/Rewards.js @@ -1,4 +1,4 @@ -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import LauncherDialog from './components/LauncherDialog'; import RecruitmentMenu from './components/RecruitmentMenu'; import RewardMissions from './components/RewardMissions'; diff --git a/src/game/launcher/components/FundingFlow.js b/src/game/launcher/components/FundingFlow.js index 4b0e273ab..6a8a8c310 100644 --- a/src/game/launcher/components/FundingFlow.js +++ b/src/game/launcher/components/FundingFlow.js @@ -4,7 +4,7 @@ import { createPortal } from 'react-dom'; import { PropagateLoader as Loader } from 'react-spinners'; import { RampInstantSDK } from '@ramp-network/ramp-instant-sdk'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import Button from '~/components/ButtonAlt'; import { ChevronRightIcon, CloseIcon, LinkIcon, WalletIcon } from '~/components/Icons'; import Details from '~/components/DetailsV2'; diff --git a/src/game/launcher/components/RewardMissions.js b/src/game/launcher/components/RewardMissions.js index a835a1fba..55cc0438e 100644 --- a/src/game/launcher/components/RewardMissions.js +++ b/src/game/launcher/components/RewardMissions.js @@ -2,7 +2,7 @@ import { useCallback, useState } from 'react'; import styled from 'styled-components'; import Loader from 'react-spinners/PuffLoader'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import AsteroidsHeroImage from '~/assets/images/sales/asteroids_hero.png'; import AsteroidSurfaceImage from '~/assets/images/hud_headers/Asteroid.png'; import ClipCorner from '~/components/ClipCorner'; diff --git a/src/game/launcher/components/RewardQuests.js b/src/game/launcher/components/RewardQuests.js index 443acc082..3177dde17 100644 --- a/src/game/launcher/components/RewardQuests.js +++ b/src/game/launcher/components/RewardQuests.js @@ -2,7 +2,7 @@ import { useState } from 'react'; import styled from 'styled-components'; import Loader from 'react-spinners/PuffLoader'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import Image1 from '~/assets/images/hud_headers/Asteroid.png'; import Image2 from '~/assets/images/hud_headers/SurfaceShip.png'; import Image3 from '~/assets/images/hud_headers/Building_9.png'; diff --git a/src/game/launcher/components/SKU.js b/src/game/launcher/components/SKU.js index 5fe955974..a4fd574bd 100644 --- a/src/game/launcher/components/SKU.js +++ b/src/game/launcher/components/SKU.js @@ -2,7 +2,7 @@ import { useCallback, useContext, useEffect, useMemo, useState } from 'react'; import { useQueryClient } from 'react-query'; import styled from 'styled-components'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import AsteroidsHeroImage from '~/assets/images/sales/asteroids_hero.png'; import CrewmatesHeroImage from '~/assets/images/sales/crewmates_hero.png'; import SwayImage from '~/assets/images/sales/sway.png'; diff --git a/src/game/launcher/components/SupportMenu.js b/src/game/launcher/components/SupportMenu.js index 89943944e..75eac8066 100644 --- a/src/game/launcher/components/SupportMenu.js +++ b/src/game/launcher/components/SupportMenu.js @@ -1,7 +1,7 @@ import { useCallback } from 'react'; import styled from 'styled-components'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import { ChevronDoubleRightIcon, InfluenceIcon } from '~/components/Icons'; import ClipCorner from '~/components/ClipCorner'; diff --git a/src/game/scene/asteroid/Lots.js b/src/game/scene/asteroid/Lots.js index 621effb16..b72121ca9 100644 --- a/src/game/scene/asteroid/Lots.js +++ b/src/game/scene/asteroid/Lots.js @@ -38,7 +38,7 @@ import theme from '~/theme'; import frag from './shaders/delivery.frag'; import vert from './shaders/delivery.vert'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; const { MAX_LOTS_RENDERED } = constants; diff --git a/src/gtm.js b/src/gtm.js index d42bb09a0..1cc31bc77 100644 --- a/src/gtm.js +++ b/src/gtm.js @@ -1,6 +1,6 @@ import TagManager from 'react-gtm-module'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; export const initializeTagManager = () => { if (appConfig.get('Api.ClientId.gtm')) TagManager.initialize({ gtmId: appConfig.get('Api.ClientId.gtm') }); diff --git a/src/hooks/actionManagers/useNftSaleManager.js b/src/hooks/actionManagers/useNftSaleManager.js index 4cd74bdcb..903e1ef9c 100644 --- a/src/hooks/actionManagers/useNftSaleManager.js +++ b/src/hooks/actionManagers/useNftSaleManager.js @@ -1,7 +1,7 @@ import { useCallback, useContext, useMemo } from 'react'; import { Entity } from '@influenceth/sdk'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import ChainTransactionContext from '~/contexts/ChainTransactionContext'; import useCrewContext from '~/hooks/useCrewContext'; diff --git a/src/hooks/useAnnotationContent.js b/src/hooks/useAnnotationContent.js index 7284dfd77..f1ea598c2 100644 --- a/src/hooks/useAnnotationContent.js +++ b/src/hooks/useAnnotationContent.js @@ -1,7 +1,7 @@ import axios from 'axios'; import { useQuery } from 'react-query'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; const useAnnotationContent = (annotation) => { const hash = annotation?.ipfs?.hash; diff --git a/src/hooks/useBookTokens.js b/src/hooks/useBookTokens.js index 1292a7245..eb483ce33 100644 --- a/src/hooks/useBookTokens.js +++ b/src/hooks/useBookTokens.js @@ -1,6 +1,6 @@ import { useMemo } from 'react'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import useCrewContext from '~/hooks/useCrewContext'; import { useSwayBalance } from '~/hooks/useWalletTokenBalance'; import formatters from '~/lib/formatters'; diff --git a/src/hooks/useGetActivityConfig.js b/src/hooks/useGetActivityConfig.js index 6e4b51321..961680eea 100644 --- a/src/hooks/useGetActivityConfig.js +++ b/src/hooks/useGetActivityConfig.js @@ -1,7 +1,7 @@ import { useMemo } from 'react'; import { useQueryClient } from 'react-query'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import useCrewContext from '~/hooks/useCrewContext'; import activities, { getHydrationQueryKey } from '~/lib/activities'; diff --git a/src/hooks/useStore.js b/src/hooks/useStore.js index a0b3004d8..cb4c88919 100644 --- a/src/hooks/useStore.js +++ b/src/hooks/useStore.js @@ -9,7 +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'; +import { appConfig } from '~/appConfig'; export const STORE_NAME = 'influence'; diff --git a/src/hooks/useSwapHelper.js b/src/hooks/useSwapHelper.js index 5410630b7..cccb9f84d 100644 --- a/src/hooks/useSwapHelper.js +++ b/src/hooks/useSwapHelper.js @@ -1,7 +1,7 @@ import { useCallback, useMemo } from 'react'; import { fetchBuildExecuteTransaction } from '@avnu/avnu-sdk'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import useStore from '~/hooks/useStore'; import useWalletPurchasableBalances from '~/hooks/useWalletPurchasableBalances'; import { TOKEN } from '~/lib/priceUtils'; diff --git a/src/hooks/useTutorialSteps.js b/src/hooks/useTutorialSteps.js index 88e535b84..230bfa6b7 100644 --- a/src/hooks/useTutorialSteps.js +++ b/src/hooks/useTutorialSteps.js @@ -2,7 +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 { appConfig } from '~/appConfig'; import useCrewAgreements from '~/hooks/useCrewAgreements'; import useCrewBuildings from '~/hooks/useCrewBuildings'; import useCrewContext from '~/hooks/useCrewContext'; diff --git a/src/lib/activities.js b/src/lib/activities.js index fa03071b2..a4a991102 100644 --- a/src/lib/activities.js +++ b/src/lib/activities.js @@ -2,7 +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 { appConfig } from '~/appConfig'; import AddressLink from '~/components/AddressLink'; import EntityLink from '~/components/EntityLink'; import { diff --git a/src/lib/api.js b/src/lib/api.js index bbdbd291d..aadb4bec8 100644 --- a/src/lib/api.js +++ b/src/lib/api.js @@ -3,7 +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 { appConfig } from '~/appConfig'; import useStore from '~/hooks/useStore'; import { entityToAgreements, esbLocationQuery, esbPermissionQuery, safeBigInt, safeEntityId } from './utils'; import { TOKEN, TOKEN_SCALE } from './priceUtils'; diff --git a/src/lib/assetUtils.js b/src/lib/assetUtils.js index 0afa93358..b34845616 100644 --- a/src/lib/assetUtils.js +++ b/src/lib/assetUtils.js @@ -1,6 +1,6 @@ import { Assets, Building, Product, Ship } from '@influenceth/sdk'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; const ASSET_CACHE = {}; diff --git a/src/lib/cacheKey.js b/src/lib/cacheKey.js index 5787b5477..b3257b2b2 100644 --- a/src/lib/cacheKey.js +++ b/src/lib/cacheKey.js @@ -1,5 +1,5 @@ import { Entity } from '@influenceth/sdk'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; /* CACHE KEY DICTIONARY non-entity based diff --git a/src/lib/getAlertContent.js b/src/lib/getAlertContent.js index 4dca89555..814d7f1fb 100644 --- a/src/lib/getAlertContent.js +++ b/src/lib/getAlertContent.js @@ -1,4 +1,4 @@ -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import { UpdateIcon, WarningIcon, SettingsIcon, WalletIcon, ClipboardIcon } from '~/components/Icons'; const entries = { diff --git a/src/lib/priceUtils.js b/src/lib/priceUtils.js index 746d7a4a2..1ea534bd5 100644 --- a/src/lib/priceUtils.js +++ b/src/lib/priceUtils.js @@ -1,6 +1,6 @@ import { Address } from '@influenceth/sdk'; -import appConfig from '~/appConfig'; +import { appConfig } from '~/appConfig'; import { EthIcon, SwayIcon } from '~/components/Icons'; import { safeBigInt } from './utils'; diff --git a/src/lib/utils.js b/src/lib/utils.js index c110ec7ce..c2db31894 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -3,7 +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 { appConfig } from '~/appConfig'; import { ManufactureIcon, GrowIcon, AssembleIcon, RefineIcon } from '~/components/Icons'; import { TOKEN, TOKEN_SCALE } from './priceUtils'; diff --git a/src/simulation/useSimulationSteps.js b/src/simulation/useSimulationSteps.js index e64dab0c0..5366f3002 100644 --- a/src/simulation/useSimulationSteps.js +++ b/src/simulation/useSimulationSteps.js @@ -3,7 +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 { 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'; From fcf7f2e997f8f48bfddb2cc8c0d48e9f64ad4d7b Mon Sep 17 00:00:00 2001 From: Patrick Keenum <5631043+prof197@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:20:00 -0400 Subject: [PATCH 3/9] fixes --- src/game/interface/details/crewAssignments/Complete.js | 2 +- src/game/interface/details/crewAssignments/Create.js | 2 +- src/game/interface/hud/HudMenu.js | 2 +- src/game/interface/hud/hudMenus/DevTools.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/interface/details/crewAssignments/Complete.js b/src/game/interface/details/crewAssignments/Complete.js index 6ba994c40..df7823186 100644 --- a/src/game/interface/details/crewAssignments/Complete.js +++ b/src/game/interface/details/crewAssignments/Complete.js @@ -383,7 +383,7 @@ // //
You must be over 18 years or older to make a purchase.
+
+
diff --git a/src/hooks/useStore.js b/src/hooks/useStore.js
index cb4c88919..504ea5b9f 100644
--- a/src/hooks/useStore.js
+++ b/src/hooks/useStore.js
@@ -50,6 +50,7 @@ const simulationStateDefault = {
const useStore = create(subscribeWithSelector(persist((set, get) => ({
actionDialog: {},
+ ageVerified: false,
launcherPage: null,
launcherSubpage: null,
openHudMenu: null,
@@ -767,6 +768,10 @@ const useStore = create(subscribeWithSelector(persist((set, get) => ({
}
})),
+ dispatchAgeVerified: () => set(produce(state => {
+ state.ageVerified = true;
+ })),
+
//
// SPECIAL GETTERS