chore: sync upstream main

public/configs/v1/env.json

@@ -462,7 +462,8 @@
            "stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
            "faucet": "https://faucet.v4dev.dydx.exchange",
            "affiliates": "https://dydx.stg.fuul.xyz",           
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -504,7 +505,8 @@
            "neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
            "geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
            "geo": "https://api.dydx.exchange/v4/geo",            
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -549,7 +551,8 @@
            "stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
            "faucet": "http://dev3-faucet-lb-public-1644791410.us-east-2.elb.amazonaws.com",
            "affiliates": "https://dydx.stg.fuul.xyz",            
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -594,7 +597,8 @@
            "stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
            "faucet": "https://faucet.v4dev4.dydx.exchange",
            "affiliates": "https://dydx.stg.fuul.xyz",         
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -636,7 +640,8 @@
            "neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
            "geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
            "geo": "https://api.dydx.exchange/v4/geo",          
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -680,7 +685,8 @@
            "neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
            "geo": "https://api.dydx.exchange/v4/geo",
            "geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",       
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -724,7 +730,8 @@
            "neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
            "geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
            "geo": "https://api.dydx.exchange/v4/geo",           
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "apps": {
            "ios": {
@@ -780,7 +787,8 @@
            "neutronValidator": "https://neutron-testnet-rpc.polkachu.com/",
            "geoV2": "https://geo-whitelist-web-mainnet-preview.infrastructure-34d.workers.dev/",
            "geo": "https://api.dydx.exchange/v4/geo",           
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -826,7 +834,8 @@
            "stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
            "faucet": "https://faucet.v4testnet.dydx.exchange",
            "affiliates": "https://dydx.stg.fuul.xyz",          
-           "spotApi": "https://dydx-solana-api-staging-e2fb353831a4.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-staging-e2fb353831a4.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [
            "dydxvaloper1vvc9vl6z9pu0vt2y79d0ln8zp6qmpmrhxx99h4",
@@ -874,7 +883,8 @@
            "stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
            "faucet": "https://faucet.v4testnet.dydx.exchange",
            "affiliates": "https://dydx.stg.fuul.xyz",          
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -919,7 +929,8 @@
            "stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
            "faucet": "https://faucet.v4testnet.dydx.exchange",
            "affiliates": "https://dydx.stg.fuul.xyz",
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -964,7 +975,8 @@
            "stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
            "faucet": "https://faucet.v4testnet.dydx.exchange",
            "affiliates": "https://dydx.stg.fuul.xyz",          
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -1009,7 +1021,8 @@
            "stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
            "faucet": "https://faucet.v4testnet.dydx.exchange",
            "affiliates": "https://dydx.stg.fuul.xyz",           
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -1054,7 +1067,8 @@
            "stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
            "faucet": "https://faucet.v4testnet.dydx.exchange",
            "affiliates": "https://dydx.stg.fuul.xyz",       
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -1099,7 +1113,8 @@
            "stakingAPR": "https://apybara-proxy-web-testnet.infrastructure-34d.workers.dev/v0/protocols/dydx",
            "faucet": "https://faucet.v4testnet.dydx.exchange",
            "affiliates": "https://dydx.stg.fuul.xyz",        
-           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com"
+           "spotApi": "https://dydx-solana-api-prod-89bf4c933ba0.herokuapp.com",
+           "pnlImageApi": "https://image-generator.dydx.trade/generate-trade-card-web"
         },
         "stakingValidators": [],
         "featureFlags": {
@@ -1144,7 +1159,8 @@
            "geoV2": "[geo v2 endpoint for mainnet]",
            "stakingAPR": "[staking APR endpoint for mainnet]",
            "affiliates": "[affiliates endpoint for mainnet]",
-           "spotApi": "[spot api endpoint for mainnet]"
+           "spotApi": "[spot api endpoint for mainnet]",
+           "pnlImageApi": "[pnl image api endpoint for mainnet]"
         },
         "stakingValidators": [],
         "featureFlags": {

src/App.tsx

@@ -52,9 +52,9 @@ import { SkipProvider } from './hooks/transfers/skipClient';
 import { useAnalytics } from './hooks/useAnalytics';
 import { useBreakpoints } from './hooks/useBreakpoints';
 import { useCommandMenu } from './hooks/useCommandMenu';
+import { useComplianceState } from './hooks/useComplianceState';
 import { useInitializePage } from './hooks/useInitializePage';
 import { useLocalStorage } from './hooks/useLocalStorage';
-import { usePerpetualsComplianceState } from './hooks/usePerpetualsComplianceState';
 import { useReferralCode } from './hooks/useReferralCode';
 import { useShouldShowFooter } from './hooks/useShouldShowFooter';
 import { useSimpleUiEnabled } from './hooks/useSimpleUiEnabled';
@@ -109,7 +109,7 @@ const Content = () => {
   const isShowingFooter = useShouldShowFooter();
   const abDefaultToMarkets = useCustomFlagValue(CustomFlags.abDefaultToMarkets);
   const isSimpleUi = useSimpleUiEnabled();
-  const { showComplianceBanner } = usePerpetualsComplianceState();
+  const { showComplianceBanner } = useComplianceState();
   const isSimpleUiUserMenuOpen = useAppSelector(getIsUserMenuOpen);
 
   // Track current path in Redux for conditional polling

src/bonsai/calculators/compliance.ts

@@ -7,9 +7,10 @@ export function calculateCompliance({
   geo: geoBase,
   localAddressScreenV2,
   sourceAddressScreenV2,
+  solanaAddressScreen,
 }: ComplianceState): Compliance {
   const geo = {
-    currentlyGeoBlocked: geoBase.data?.whitelisted
+    isPerpetualsGeoBlocked: geoBase.data?.whitelisted
       ? false
       : geoHeaders.data?.status === 'restricted',
     currentCountry: geoHeaders.data?.country,
@@ -23,6 +24,14 @@ export function calculateCompliance({
     };
   }
 
+  if (solanaAddressScreen.data?.status === ComplianceStatus.BLOCKED) {
+    return {
+      geo,
+      status: ComplianceStatus.BLOCKED,
+      updatedAt: solanaAddressScreen.data.updatedAt,
+    };
+  }
+
   if (localAddressScreenV2.data?.errors != null) {
     return {
       geo,

src/bonsai/lifecycles/cancelTriggerOrdersLifecycle.ts

@@ -1,3 +1,6 @@
+// eslint-disable-next-line import/no-internal-modules
+import { selectRawParentSubaccountData } from '@/bonsai/selectors/base';
+
 import { timeUnits } from '@/constants/time';
 import { WalletNetworkType } from '@/constants/wallets';
 
@@ -25,7 +28,7 @@ export function setUpCancelOrphanedTriggerOrdersLifecycle(store: RootStore) {
   const selector = createAppSelector(
     [selectTxAuthorizedCloseOnlyAccount, selectOrphanedTriggerOrders],
     (txAuthorizedAccount, orphanedTriggerOrders) => {
-      if (!txAuthorizedAccount || orphanedTriggerOrders == null) {
+      if (!txAuthorizedAccount || orphanedTriggerOrders?.ordersToCancel == null) {
         return undefined;
       }
 
@@ -35,7 +38,8 @@ export function setUpCancelOrphanedTriggerOrdersLifecycle(store: RootStore) {
         localDydxWallet,
         sourceAccount,
         parentSubaccountInfo,
-        ordersToCancel: orphanedTriggerOrders,
+        ordersToCancel: orphanedTriggerOrders.ordersToCancel,
+        groupedPositions: orphanedTriggerOrders.groupedPositions,
       };
     }
   );
@@ -51,7 +55,7 @@ export function setUpCancelOrphanedTriggerOrdersLifecycle(store: RootStore) {
 
       runFn(async () => {
         try {
-          const { ordersToCancel: ordersToCancelRaw } = data;
+          const { ordersToCancel: ordersToCancelRaw, groupedPositions } = data;
           const ordersToCancel = ordersToCancelRaw.filter((o) => !cancelingOrderIds.has(o.id));
 
           // context: Cosmos wallets do not support our lifecycle methods and are instead handled within useNotificationTypes
@@ -67,6 +71,8 @@ export function setUpCancelOrphanedTriggerOrdersLifecycle(store: RootStore) {
             `Cancelling ${ordersToCancel.length} trigger orders`,
             {
               ordersToCancel,
+              groupedPositions,
+              bonsaiParentSubaccountData: selectRawParentSubaccountData(store.getState()),
             }
           );
 

src/bonsai/rest/compliance.ts

@@ -1,10 +1,18 @@
 import { timeUnits } from '@/constants/time';
 
 import { type RootStore } from '@/state/_store';
-import { getUserSourceWalletAddress, getUserWalletAddress } from '@/state/accountInfoSelectors';
+import {
+  getUserSolanaWalletAddress,
+  getUserSourceWalletAddress,
+  getUserWalletAddress,
+} from '@/state/accountInfoSelectors';
 import { getSelectedDydxChainId, getSelectedNetwork } from '@/state/appSelectors';
 import { createAppSelector } from '@/state/appTypes';
-import { setLocalAddressScreenV2Raw, setSourceAddressScreenV2Raw } from '@/state/raw';
+import {
+  setLocalAddressScreenV2Raw,
+  setSolanaAddressScreenRaw,
+  setSourceAddressScreenV2Raw,
+} from '@/state/raw';
 import { getHdKeyNonce } from '@/state/walletSelectors';
 
 import { loadableIdle } from '../lib/loadable';
@@ -103,3 +111,26 @@ export function setUpIndexerLocalAddressScreenV2Query(store: RootStore) {
     store.dispatch(setLocalAddressScreenV2Raw(loadableIdle()));
   };
 }
+
+export function setUpIndexerSolanaAddressScreenQuery(store: RootStore) {
+  const cleanupEffect = createIndexerQueryStoreEffect(store, {
+    name: 'solanaAddressScreen',
+    selector: getUserSolanaWalletAddress,
+    getQueryKey: (address) => ['screenSolanaWallet', address],
+    getQueryFn: (indexerClient, address) => {
+      if (address == null) {
+        return null;
+      }
+      return () => indexerClient.utility.complianceScreen(address);
+    },
+    onResult: (screen) => {
+      store.dispatch(setSolanaAddressScreenRaw(queryResultToLoadable(screen)));
+    },
+    onNoQuery: () => store.dispatch(setSolanaAddressScreenRaw(loadableIdle())),
+    ...pollingOptions,
+  });
+  return () => {
+    cleanupEffect();
+    store.dispatch(setSolanaAddressScreenRaw(loadableIdle()));
+  };
+}

src/bonsai/rest/fills.ts

@@ -19,7 +19,7 @@
     selector: selectParentSubaccountInfo,
     getQueryKey: (data) => ['account', 'fills', data.wallet, data.subaccount],
     getQueryFn: (indexerClient, data) => {
-      if (!isTruthy(data.wallet) || data.subaccount == null || data.isGeoRestricted) {
+      if (!isTruthy(data.wallet) || data.subaccount == null || data.isPerpsGeoRestricted) {
         return null;
       }
       return () =>

src/bonsai/rest/lib/nobleTransactionStoreEffect.ts

@@ -58,7 +58,7 @@
         ComplianceStatus.CLOSE_ONLY,
         ComplianceStatus.FIRST_STRIKE_CLOSE_ONLY,
       ].includes(complianceData.status) &&
-      !(complianceData.geo.currentlyGeoBlocked && enableGeoCheck);
+      !(complianceData.geo.isPerpetualsGeoBlocked && enableGeoCheck);
 
     if (!parentSubaccountInfo.wallet || !isAccountRestrictionFree || localWalletNonce == null) {
       return undefined;
@@ -71,7 +71,7 @@
     });
     const isCorrectWallet = localNobleWallet?.address === nobleAddress;
 
     if (!isCorrectWallet || localNobleWallet == null) return undefined;
 
     return {
       localNobleWallet,

src/bonsai/rest/orders.ts

@@ -21,7 +21,7 @@
     selector: selectParentSubaccountInfo,
     getQueryKey: (data) => ['account', 'orders', data.wallet, data.subaccount],
     getQueryFn: (indexerClient, data) => {
-      if (!isTruthy(data.wallet) || data.subaccount == null || data.isGeoRestricted) {
+      if (!isTruthy(data.wallet) || data.subaccount == null || data.isPerpsGeoRestricted) {
         return null;
       }
       return () =>
@@ -42,7 +42,7 @@
       store.dispatch(
         setAccountOrdersRaw(
           mapLoadableData(queryResultToLoadable(orders), (data) =>
             keyBy(isParentSubaccountOrders(data), (o) => o.id ?? '')
           )
         )
       );

src/bonsai/rest/transfers.ts

@@ -21,7 +21,7 @@
     selector: selectParentSubaccountInfo,
     getQueryKey: (data) => ['account', 'transfers', data],
     getQueryFn: (indexerClient, data) => {
-      if (!isTruthy(data.wallet) || data.subaccount == null || data.isGeoRestricted) {
+      if (!isTruthy(data.wallet) || data.subaccount == null || data.isPerpsGeoRestricted) {
         return null;
       }
       return async () => {

src/bonsai/selectors/accountTransaction.ts

@@ -39,7 +39,7 @@ export const selectTxAuthorizedAccount = createAppSelector(
         ComplianceStatus.CLOSE_ONLY,
         ComplianceStatus.FIRST_STRIKE_CLOSE_ONLY,
       ].includes(complianceData.status) &&
-      !(complianceData.geo.currentlyGeoBlocked && geoCheckEnabled);
+      !(complianceData.geo.isPerpetualsGeoBlocked && geoCheckEnabled);
 
     if (!parentSubaccountInfo.wallet || !isAccountRestrictionFree || localWalletNonce == null) {
       return undefined;

src/bonsai/selectors/base.ts

@@ -71,6 +71,8 @@ export const selectRawLocalAddressScreenV2 = (state: RootState) =>
   state.raw.compliance.localAddressScreenV2;
 export const selectRawSourceAddressScreenV2 = (state: RootState) =>
   state.raw.compliance.sourceAddressScreenV2;
+export const selectRawSolanaAddressScreen = (state: RootState) =>
+  state.raw.compliance.solanaAddressScreen;
 export const selectRawGeo = (state: RootState) => state.raw.compliance.geo;
 export const selectRawGeoHeaders = (state: RootState) => state.raw.compliance.geoHeaders;
 export const selectRawRewardParams = (state: RootState) => state.raw.rewards.data.data;