feat: dynamic slippage solana persistence

Author: ghgoodreau

app/_locales/en/messages.json

@@ -106,6 +106,7 @@ export type Preferences = {
   };
   tokenNetworkFilter: Record<string, boolean>;
   dismissSmartAccountSuggestionEnabled: boolean;
+  solanaSlippage?: number;
 };
 
 // Omitting properties that already exist in the PreferencesState, as part of the preferences property.
@@ -200,6 +201,7 @@ export const getDefaultPreferencesControllerState =
         sortCallback: 'stringNumeric',
       },
       tokenNetworkFilter: {},
+      solanaSlippage: undefined,
     },
     // ENS decentralized website resolution
     ipfsGateway: IPFS_DEFAULT_GATEWAY_URL,
@@ -357,6 +359,10 @@ const controllerMetadata = {
         persist: true,
         anonymous: true,
       },
+      solanaSlippage: {
+        persist: true,
+        anonymous: true,
+      },
     },
   },
   ipfsGateway: {

app/_locales/en_GB/messages.json

@@ -66,6 +66,7 @@ import {
 } from '../../../shared/constants/hardware-wallets';
 import { toAssetId } from '../../../shared/lib/asset-utils';
 import { getRemoteFeatureFlags } from '../../selectors/remote-feature-flags';
+import { getPreferences } from '../../selectors';
 import {
   exchangeRateFromMarketData,
   exchangeRatesFromNativeAndCurrencyRates,
@@ -244,6 +245,9 @@ export const getFromAmount = (state: BridgeAppState): string | null =>
 
 export const getSlippage = (state: BridgeAppState) => state.bridge.slippage;
 
+export const getSolanaSlippage = (state: BridgeAppState) =>
+  getPreferences(state)?.solanaSlippage;
+
 export const getQuoteRequest = (state: BridgeAppState) => {
   const { quoteRequest } = state.metamask;
   return quoteRequest;
@@ -618,6 +622,40 @@ export const getIsToOrFromSolana = createSelector(
   },
 );
 
+export const getIsSolanaSwap = createSelector(
+  getFromChain,
+  getToChain,
+  (fromChain, toChain) => {
+    if (!fromChain?.chainId || !toChain?.chainId) {
+      return false;
+    }
+
+    const fromChainIsSolana = isSolanaChainId(fromChain.chainId);
+    const toChainIsSolana = isSolanaChainId(toChain.chainId);
+
+    // Return true if BOTH chains are Solana (Solana-to-Solana swap)
+    return fromChainIsSolana && toChainIsSolana;
+  },
+);
+
+export const getEffectiveSlippage = (state: BridgeAppState) => {
+  const isSolanaSwap = getIsSolanaSwap(state);
+  const solanaSlippage = getSolanaSlippage(state);
+  const regularSlippage = getSlippage(state);
+
+  // For Solana transactions (either bridge to/from Solana or Solana-to-Solana swap),
+  // use solanaSlippage if it's been set by the user, otherwise default to undefined (AUTO)
+  // Note: We check for both null and undefined since JSON serialization converts undefined to null
+  if (isSolanaSwap) {
+    return solanaSlippage === null || solanaSlippage === undefined
+      ? undefined
+      : solanaSlippage;
+  }
+
+  // For EVM transactions, use the regular slippage
+  return regularSlippage;
+};
+
 export const getHardwareWalletName = (state: BridgeAppState) => {
   const type = getHardwareWalletType(state);
   switch (type) {

app/scripts/controllers/preferences-controller.ts

@@ -33,14 +33,14 @@ import {
   SEVERITIES,
 } from '../../../helpers/constants/design-system';
 import {
-  getSlippage,
-  getIsToOrFromSolana,
+  getIsSolanaSwap,
+  getEffectiveSlippage,
 } from '../../../ducks/bridge/selectors';
 import { setSlippage } from '../../../ducks/bridge/actions';
+import { setSolanaSlippage } from '../../../store/actions';
 import { useCrossChainSwapsEventTracker } from '../../../hooks/bridge/useCrossChainSwapsEventTracker';
 import { MetaMetricsEventName } from '../../../../shared/constants/metametrics';
 import { Column, Row, Tooltip } from '../layout';
-import { useIsMultichainSwap } from '../hooks/useIsMultichainSwap';
 
 const HARDCODED_SLIPPAGE_OPTIONS = [BRIDGE_DEFAULT_SLIPPAGE, 3];
 
@@ -52,12 +52,11 @@ export const BridgeTransactionSettingsModal = ({
   const trackCrossChainSwapsEvent = useCrossChainSwapsEventTracker();
 
   const dispatch = useDispatch();
-  const isSwap = useIsMultichainSwap();
-  const isToOrFromSolana = useSelector(getIsToOrFromSolana);
-  const slippage = useSelector(getSlippage);
+  const isSolanaSwap = useSelector(getIsSolanaSwap);
+  const slippage = useSelector(getEffectiveSlippage);
 
-  // For Solana trades, undefined slippage means AUTO
-  const shouldShowAutoOption = isSwap || isToOrFromSolana;
+  // AUTO option should only show for Solana-to-Solana swaps
+  const shouldShowAutoOption = isSolanaSwap;
 
   const [localSlippage, setLocalSlippage] = useState<number | undefined>(
     undefined,
@@ -71,7 +70,9 @@ export const BridgeTransactionSettingsModal = ({
   // Initialize state when modal opens
   useEffect(() => {
     if (isOpen) {
-      const shouldSelectAuto = slippage === undefined && shouldShowAutoOption;
+      // Note: We check for both null and undefined since JSON serialization converts undefined to null
+      const shouldSelectAuto =
+        (slippage === null || slippage === undefined) && shouldShowAutoOption;
       setIsAutoSelected(shouldSelectAuto);
       setLocalSlippage(shouldSelectAuto ? undefined : slippage);
       setCustomSlippage(
@@ -80,7 +81,7 @@ export const BridgeTransactionSettingsModal = ({
           : undefined,
       );
     }
-  }, [slippage, shouldShowAutoOption, isOpen]);
+  }, [slippage, shouldShowAutoOption, isOpen, isSolanaSwap]);
 
   const getNotificationConfig = () => {
     if (!customSlippage) {
@@ -148,7 +149,7 @@ export const BridgeTransactionSettingsModal = ({
                       : TextColor.textDefault
                   }
                 >
-                  AUTO
+                  {t('swapSlippageAutoDescription')}
                 </Text>
               </Button>
             )}
@@ -270,7 +271,8 @@ export const BridgeTransactionSettingsModal = ({
             size={ButtonPrimarySize.Md}
             variant={TextVariant.bodyMd}
             disabled={
-              (isAutoSelected && slippage === undefined) ||
+              (isAutoSelected &&
+                (slippage === null || slippage === undefined)) ||
               (!isAutoSelected &&
                 ((customSlippage !== undefined &&
                   Number(customSlippage.replace(',', '.')) === slippage) ||
@@ -289,7 +291,12 @@ export const BridgeTransactionSettingsModal = ({
                     value: newSlippage?.toString() ?? 'auto',
                   },
                 });
-                dispatch(setSlippage(newSlippage));
+
+                if (isSolanaSwap) {
+                  dispatch(setSolanaSlippage(newSlippage));
+                } else {
+                  dispatch(setSlippage(newSlippage));
+                }
                 onClose();
               }
             }}

ui/ducks/bridge/selectors.ts

@@ -19,6 +19,7 @@ import {
   getNativeAssetForChainId,
   isNativeAddress,
   UnifiedSwapBridgeEventName,
+  BRIDGE_DEFAULT_SLIPPAGE,
 } from '@metamask/bridge-controller';
 import {
   setFromToken,
@@ -38,7 +39,7 @@ import {
   getFromChains,
   getFromToken,
   getQuoteRequest,
-  getSlippage,
+  getEffectiveSlippage,
   getToChain,
   getToChains,
   getToToken,
@@ -47,6 +48,7 @@ import {
   getValidationErrors,
   isBridgeSolanaEnabled,
   getIsToOrFromSolana,
+  getIsSolanaSwap,
   getQuoteRefreshRate,
   getHardwareWalletName,
   getIsQuoteExpired,
@@ -167,7 +169,7 @@ const PrepareBridgePage = () => {
   const smartTransactionsEnabled = useSelector(getSmartTransactionsEnabled);
 
   const providerConfig = useMultichainSelector(getMultichainProviderConfig);
-  const slippage = useSelector(getSlippage);
+  const slippage = useSelector(getEffectiveSlippage);
 
   const quoteRequest = useSelector(getQuoteRequest);
   const {
@@ -350,6 +352,7 @@ const PrepareBridgePage = () => {
   ]);
 
   const isToOrFromSolana = useSelector(getIsToOrFromSolana);
+  const isSolanaSwap = useSelector(getIsSolanaSwap);
 
   const isDestinationSolana = useMemo(() => {
     if (!toChain?.chainId) {
@@ -520,7 +523,16 @@ const PrepareBridgePage = () => {
       timestamp: Date.now(),
     });
     if (isSwap) {
-      dispatch(setSlippage(undefined));
+      // Check if this is a Solana-to-Solana swap at execution time to avoid adding it as a dependency
+      const currentIsSolanaSwap = isSolanaSwap;
+      if (currentIsSolanaSwap) {
+        // For Solana-to-Solana swaps, use undefined (AUTO)
+        // getEffectiveSlippage will use solanaSlippage preference or default to undefined
+        dispatch(setSlippage(undefined));
+      } else {
+        // For EVM swaps, use the bridge default slippage
+        dispatch(setSlippage(BRIDGE_DEFAULT_SLIPPAGE));
+      }
       if (fromChain && !toToken) {
         dispatch(setToChainId(fromChain.chainId));
         dispatch(setToToken(SOLANA_USDC_ASSET));

ui/pages/bridge/prepare/bridge-transaction-settings-modal.tsx

@@ -3521,6 +3521,10 @@ export function setAutoLockTimeLimit(value: number | null) {
   return setPreference('autoLockTimeLimit', value);
 }
 
+export function setSolanaSlippage(value: number | undefined) {
+  return setPreference('solanaSlippage', value);
+}
+
 export function setCompletedOnboarding(): ThunkAction<
   void,
   MetaMaskReduxState,