Skip to content

Commit 4247be3

Browse files
qardpeetqardpeet
committed
checkpoint
1 parent 98f6371 commit 4247be3

39 files changed

+1247
-421
lines changed

‎public/configs/v1/env.json‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,8 @@
457457
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
458458
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
459459
"faucet": "https://faucet.v4dev.dydx.exchange",
460-
"affiliates": "https://dydx.stg.fuul.xyz"
460+
"affiliates": "https://dydx.stg.fuul.xyz",
461+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
461462
},
462463
"stakingValidators": [],
463464
"featureFlags": {
@@ -498,7 +499,8 @@
498499
"osmosisValidator": "https://rpc.osmotest5.osmosis.zone/",
499500
"neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
500501
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
501-
"geo": "https://api.dydx.exchange/v4/geo"
502+
"geo": "https://api.dydx.exchange/v4/geo",
503+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
502504
},
503505
"stakingValidators": [],
504506
"featureFlags": {
@@ -542,7 +544,8 @@
542544
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
543545
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
544546
"faucet": "http://dev3-faucet-lb-public-1644791410.us-east-2.elb.amazonaws.com",
545-
"affiliates": "https://dydx.stg.fuul.xyz"
547+
"affiliates": "https://dydx.stg.fuul.xyz",
548+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
546549
},
547550
"stakingValidators": [],
548551
"featureFlags": {
@@ -586,7 +589,8 @@
586589
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
587590
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
588591
"faucet": "https://faucet.v4dev4.dydx.exchange",
589-
"affiliates": "https://dydx.stg.fuul.xyz"
592+
"affiliates": "https://dydx.stg.fuul.xyz",
593+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
590594
},
591595
"stakingValidators": [],
592596
"featureFlags": {
@@ -627,7 +631,8 @@
627631
"osmosisValidator": "https://rpc.osmotest5.osmosis.zone/",
628632
"neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
629633
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
630-
"geo": "https://api.dydx.exchange/v4/geo"
634+
"geo": "https://api.dydx.exchange/v4/geo",
635+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
631636
},
632637
"stakingValidators": [],
633638
"featureFlags": {
@@ -671,7 +676,8 @@
671676
"neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
672677
"geo": "https://api.dydx.exchange/v4/geo",
673678
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
674-
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com"
679+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
680+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
675681
},
676682
"stakingValidators": [],
677683
"featureFlags": {
@@ -714,7 +720,8 @@
714720
"osmosisValidator": "https://rpc.osmotest5.osmosis.zone/",
715721
"neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
716722
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
717-
"geo": "https://api.dydx.exchange/v4/geo"
723+
"geo": "https://api.dydx.exchange/v4/geo",
724+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
718725
},
719726
"apps": {
720727
"ios": {
@@ -769,7 +776,8 @@
769776
"osmosisValidator": "https://rpc.osmotest5.osmosis.zone/",
770777
"neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
771778
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
772-
"geo": "https://api.dydx.exchange/v4/geo"
779+
"geo": "https://api.dydx.exchange/v4/geo",
780+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
773781
},
774782
"stakingValidators": [],
775783
"featureFlags": {
@@ -815,7 +823,8 @@
815823
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
816824
"faucet": "https://faucet.v4testnet.dydx.exchange",
817825
"affiliates": "https://dydx.stg.fuul.xyz",
818-
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com"
826+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
827+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
819828
},
820829
"stakingValidators": [
821830
"dydxvaloper1vvc9vl6z9pu0vt2y79d0ln8zp6qmpmrhxx99h4",
@@ -862,7 +871,8 @@
862871
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
863872
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
864873
"faucet": "https://faucet.v4testnet.dydx.exchange",
865-
"affiliates": "https://dydx.stg.fuul.xyz"
874+
"affiliates": "https://dydx.stg.fuul.xyz",
875+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
866876
},
867877
"stakingValidators": [],
868878
"featureFlags": {
@@ -906,7 +916,8 @@
906916
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
907917
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
908918
"faucet": "https://faucet.v4testnet.dydx.exchange",
909-
"affiliates": "https://dydx.stg.fuul.xyz"
919+
"affiliates": "https://dydx.stg.fuul.xyz",
920+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
910921
},
911922
"stakingValidators": [],
912923
"featureFlags": {
@@ -950,7 +961,8 @@
950961
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
951962
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
952963
"faucet": "https://faucet.v4testnet.dydx.exchange",
953-
"affiliates": "https://dydx.stg.fuul.xyz"
964+
"affiliates": "https://dydx.stg.fuul.xyz",
965+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
954966
},
955967
"stakingValidators": [],
956968
"featureFlags": {
@@ -994,7 +1006,8 @@
9941006
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
9951007
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
9961008
"faucet": "https://faucet.v4testnet.dydx.exchange",
997-
"affiliates": "https://dydx.stg.fuul.xyz"
1009+
"affiliates": "https://dydx.stg.fuul.xyz",
1010+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
9981011
},
9991012
"stakingValidators": [],
10001013
"featureFlags": {
@@ -1038,7 +1051,8 @@
10381051
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
10391052
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
10401053
"faucet": "https://faucet.v4testnet.dydx.exchange",
1041-
"affiliates": "https://dydx.stg.fuul.xyz"
1054+
"affiliates": "https://dydx.stg.fuul.xyz",
1055+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
10421056
},
10431057
"stakingValidators": [],
10441058
"featureFlags": {
@@ -1082,7 +1096,8 @@
10821096
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
10831097
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
10841098
"faucet": "https://faucet.v4testnet.dydx.exchange",
1085-
"affiliates": "https://dydx.stg.fuul.xyz"
1099+
"affiliates": "https://dydx.stg.fuul.xyz",
1100+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
10861101
},
10871102
"stakingValidators": [],
10881103
"featureFlags": {
@@ -1126,7 +1141,8 @@
11261141
"geo": "[geo endpoint for mainnet]",
11271142
"geoV2": "[geo v2 endpoint for mainnet]",
11281143
"stakingAPR": "[staking APR endpoint for mainnet]",
1129-
"affiliates": "[affiliates endpoint for mainnet]"
1144+
"affiliates": "[affiliates endpoint for mainnet]",
1145+
"spotApi": "[spot api endpoint for mainnet]"
11301146
},
11311147
"stakingValidators": [],
11321148
"featureFlags": {

‎src/App.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ import { TurnkeyAuthProvider } from './providers/TurnkeyAuthProvider';
6767
import { TurnkeyWalletProvider } from './providers/TurnkeyWalletProvider';
6868
import { persistor } from './state/_store';
6969
import { setOnboardedThisSession } from './state/account';
70+
import { setCurrentPath } from './state/app';
7071
import { appQueryClient } from './state/appQueryClient';
7172
import { useAppDispatch, useAppSelector } from './state/appTypes';
7273
import { AppTheme, setAppThemeSetting } from './state/appUiConfigs';
@@ -104,13 +105,19 @@ const Content = () => {
104105
const { chainTokenLabel } = useTokenConfigs();
105106

106107
const location = useLocation();
108+
const dispatch = useAppDispatch();
107109
const isShowingHeader = isNotTablet;
108110
const isShowingFooter = useShouldShowFooter();
109111
const abDefaultToMarkets = useCustomFlagValue(CustomFlags.abDefaultToMarkets);
110112
const isSimpleUi = useSimpleUiEnabled();
111113
const { showComplianceBanner } = useComplianceState();
112114
const isSimpleUiUserMenuOpen = useAppSelector(getIsUserMenuOpen);
113115

116+
// Track current path in Redux for conditional polling
117+
useEffect(() => {
118+
dispatch(setCurrentPath(location.pathname));
119+
}, [location.pathname, dispatch]);
120+
114121
const pathFromHash = useMemo(() => {
115122
if (location.hash === '') {
116123
return '';

0 commit comments

Comments
 (0)