Skip to content

Commit 3183125

Browse files
qardpeetqardpeet
committed
internal test
1 parent 278cbe3 commit 3183125

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1865
-986
lines changed

‎package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
"@react-types/shared": "^3.18.1",
9191
"@react-types/table": "^3.6.1",
9292
"@reduxjs/toolkit": "^2.2.5",
93+
"@scure/bip39": "^2.0.1",
9394
"@skip-go/client": "1.5.8",
9495
"@solana/web3.js": "^1.93.0",
9596
"@statsig/js-client": "1.4.0",
@@ -116,9 +117,11 @@
116117
"@visx/xychart": "^3.1.2",
117118
"@wagmi/core": "^2.16.3",
118119
"bignumber.js": "^9.1.1",
120+
"bs58": "^6.0.0",
119121
"cmdk": "^0.2.0",
120122
"crypto-js": "^4.1.1",
121123
"cuer": "^0.0.2",
124+
"ed25519-hd-key": "^1.3.0",
122125
"export-to-csv": "^1.2.3",
123126
"fast-json-stable-stringify": "^2.1.0",
124127
"graz": "^0.1.19",
@@ -156,6 +159,7 @@
156159
"@ryoppippi/unplugin-typia": "npm:@jsr/ryoppippi__unplugin-typia@^1.1.0",
157160
"@testing-library/webdriverio": "^3.2.1",
158161
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
162+
"@types/bs58": "^5.0.0",
159163
"@types/color": "^3.0.3",
160164
"@types/crypto-js": "^4.1.1",
161165
"@types/luxon": "^3.3.0",

‎pnpm-lock.yaml‎

Lines changed: 39 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/configs/v1/env.json‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@
458458
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
459459
"faucet": "https://faucet.v4dev.dydx.exchange",
460460
"affiliates": "https://dydx.stg.fuul.xyz",
461+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
461462
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
462463
},
463464
"stakingValidators": [],
@@ -500,7 +501,8 @@
500501
"neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
501502
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
502503
"geo": "https://api.dydx.exchange/v4/geo",
503-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
504+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
505+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
504506
},
505507
"stakingValidators": [],
506508
"featureFlags": {
@@ -545,7 +547,8 @@
545547
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
546548
"faucet": "http://dev3-faucet-lb-public-1644791410.us-east-2.elb.amazonaws.com",
547549
"affiliates": "https://dydx.stg.fuul.xyz",
548-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
550+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
551+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
549552
},
550553
"stakingValidators": [],
551554
"featureFlags": {
@@ -590,7 +593,8 @@
590593
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
591594
"faucet": "https://faucet.v4dev4.dydx.exchange",
592595
"affiliates": "https://dydx.stg.fuul.xyz",
593-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
596+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
597+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
594598
},
595599
"stakingValidators": [],
596600
"featureFlags": {
@@ -632,7 +636,8 @@
632636
"neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
633637
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
634638
"geo": "https://api.dydx.exchange/v4/geo",
635-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
639+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
640+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
636641
},
637642
"stakingValidators": [],
638643
"featureFlags": {
@@ -721,7 +726,8 @@
721726
"neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
722727
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
723728
"geo": "https://api.dydx.exchange/v4/geo",
724-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
729+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
730+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
725731
},
726732
"apps": {
727733
"ios": {
@@ -777,7 +783,8 @@
777783
"neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
778784
"geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
779785
"geo": "https://api.dydx.exchange/v4/geo",
780-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
786+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
787+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
781788
},
782789
"stakingValidators": [],
783790
"featureFlags": {
@@ -824,7 +831,7 @@
824831
"faucet": "https://faucet.v4testnet.dydx.exchange",
825832
"affiliates": "https://dydx.stg.fuul.xyz",
826833
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
827-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
834+
"spotApi": "https://dydx-solana-api-staging-e2fb353831a4.herokuapp.com"
828835
},
829836
"stakingValidators": [
830837
"dydxvaloper1vvc9vl6z9pu0vt2y79d0ln8zp6qmpmrhxx99h4",
@@ -872,7 +879,8 @@
872879
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
873880
"faucet": "https://faucet.v4testnet.dydx.exchange",
874881
"affiliates": "https://dydx.stg.fuul.xyz",
875-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
882+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
883+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
876884
},
877885
"stakingValidators": [],
878886
"featureFlags": {
@@ -917,7 +925,8 @@
917925
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
918926
"faucet": "https://faucet.v4testnet.dydx.exchange",
919927
"affiliates": "https://dydx.stg.fuul.xyz",
920-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
928+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
929+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
921930
},
922931
"stakingValidators": [],
923932
"featureFlags": {
@@ -962,7 +971,8 @@
962971
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
963972
"faucet": "https://faucet.v4testnet.dydx.exchange",
964973
"affiliates": "https://dydx.stg.fuul.xyz",
965-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
974+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
975+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
966976
},
967977
"stakingValidators": [],
968978
"featureFlags": {
@@ -1007,7 +1017,8 @@
10071017
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
10081018
"faucet": "https://faucet.v4testnet.dydx.exchange",
10091019
"affiliates": "https://dydx.stg.fuul.xyz",
1010-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
1020+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
1021+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
10111022
},
10121023
"stakingValidators": [],
10131024
"featureFlags": {
@@ -1052,7 +1063,8 @@
10521063
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
10531064
"faucet": "https://faucet.v4testnet.dydx.exchange",
10541065
"affiliates": "https://dydx.stg.fuul.xyz",
1055-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
1066+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
1067+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
10561068
},
10571069
"stakingValidators": [],
10581070
"featureFlags": {
@@ -1097,7 +1109,8 @@
10971109
"stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
10981110
"faucet": "https://faucet.v4testnet.dydx.exchange",
10991111
"affiliates": "https://dydx.stg.fuul.xyz",
1100-
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
1112+
"spotCandleService": "https://pp-candle-service-stag-710ee7adad29.herokuapp.com",
1113+
"spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
11011114
},
11021115
"stakingValidators": [],
11031116
"featureFlags": {
@@ -1142,6 +1155,7 @@
11421155
"geoV2": "[geo v2 endpoint for mainnet]",
11431156
"stakingAPR": "[staking APR endpoint for mainnet]",
11441157
"affiliates": "[affiliates endpoint for mainnet]",
1158+
"spotCandleService": "[spot candle service endpoint for mainnet]",
11451159
"spotApi": "[spot api endpoint for mainnet]"
11461160
},
11471161
"stakingValidators": [],

‎src/App.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import { FooterMobile } from '@/layout/Footer/FooterMobile';
3737
import { HeaderDesktop } from '@/layout/Header/HeaderDesktop';
3838
import { NotificationsToastArea } from '@/layout/NotificationsToastArea';
3939

40-
import { testFlags } from '@/lib/testFlags';
4140
import { parseLocationHash } from '@/lib/urlUtils';
4241
import { config, privyConfig } from '@/lib/wagmi';
4342

@@ -53,6 +52,7 @@ import { useAnalytics } from './hooks/useAnalytics';
5352
import { useBreakpoints } from './hooks/useBreakpoints';
5453
import { useCommandMenu } from './hooks/useCommandMenu';
5554
import { useComplianceState } from './hooks/useComplianceState';
55+
import { useEnableSpot } from './hooks/useEnableSpot';
5656
import { useInitializePage } from './hooks/useInitializePage';
5757
import { useLocalStorage } from './hooks/useLocalStorage';
5858
import { useReferralCode } from './hooks/useReferralCode';
@@ -112,6 +112,7 @@ const Content = () => {
112112
const isSimpleUi = useSimpleUiEnabled();
113113
const { showComplianceBanner } = useComplianceState();
114114
const isSimpleUiUserMenuOpen = useAppSelector(getIsUserMenuOpen);
115+
const isSpotEnabled = useEnableSpot();
115116

116117
// Track current path in Redux for conditional polling
117118
useEffect(() => {
@@ -206,7 +207,7 @@ const Content = () => {
206207
<Route path={AppRoute.Trade} element={<TradePage />} />
207208
</Route>
208209

209-
{testFlags.spot && <Route path={`${AppRoute.Spot}/:symbol`} element={<SpotPage />} />}
210+
{isSpotEnabled && <Route path={`${AppRoute.Spot}/:symbol`} element={<SpotPage />} />}
210211

211212
<Route path={AppRoute.Markets}>
212213
<Route path={AppRoute.Markets} element={<MarketsPage />} />

0 commit comments

Comments
 (0)