misc

Author: mgrabina

src/components/transactions/Swap/constants/cow.constants.ts

@@ -70,8 +70,6 @@ export const COW_PROTOCOL_ETH_FLOW_ADDRESS_BY_ENV = (env: CowEnv) => {
 export const COW_CREATE_ORDER_ABI =
   'function createOrder((address,address,uint256,uint256,bytes32,uint256,uint32,bool,int64)) returns (bytes32)';
 
-export const HEADER_WIDGET_APP_CODE = 'aave-v3-interface-widget';
-export const ADAPTER_APP_CODE = 'aave-v3-interface-aps'; // Use this one for contract adapters so we have different dashboards
 export const COW_PARTNER_FEE = (tokenFromSymbol: string, tokenToSymbol: string) => ({
   volumeBps: getAssetGroup(tokenFromSymbol) == getAssetGroup(tokenToSymbol) ? 15 : 25,
   recipient: COW_EVM_RECIPIENT,

src/components/transactions/Swap/errors/shared/console.helpers.ts

@@ -31,6 +31,7 @@ function buildErrorPayload(state: SwapState, error: SwapError) {
     useFlashloan: state.useFlashloan ?? false,
     side: state.side,
     orderType: state.orderType,
+    swapType: state.swapType,
     slippage: state.slippage,
     input: {
       token: state.sourceToken.symbol,

src/components/transactions/Swap/inputs/LimitOrderInputs.tsx

@@ -113,15 +113,23 @@ export const LimitOrderInputs = ({
             !state.error
           }
           onChange={swapState.handleInputChange}
-          onClear={() =>
+          onClear={() => {
             setState({
               inputAmount: '',
               debouncedInputAmount: '',
               inputAmountUSD: '',
               quoteRefreshPaused: true,
               quoteLastUpdatedAt: undefined,
-            })
-          }
+            });
+            if (state.outputAmount === '') {
+              // Both reset to listen quotes
+              setState({
+                swapRate: undefined,
+                quoteRefreshPaused: false,
+                quoteLastUpdatedAt: undefined,
+              });
+            }
+          }}
           usdValue={state.inputAmountUSD || '0'}
           onSelect={swapState.handleSelectedInputToken}
           selectedAsset={state.sourceToken}
@@ -230,15 +238,23 @@ export const LimitOrderInputs = ({
           onChange={(value) => {
             swapState.handleOutputChange(value);
           }}
-          onClear={() =>
+          onClear={() => {
             setState({
               outputAmount: '',
               debouncedOutputAmount: '',
               outputAmountUSD: '',
               quoteRefreshPaused: true,
               quoteLastUpdatedAt: undefined,
-            })
-          }
+            });
+            if (state.inputAmount === '') {
+              // Both reset to listen quotes
+              setState({
+                swapRate: undefined,
+                quoteRefreshPaused: false,
+                quoteLastUpdatedAt: undefined,
+              });
+            }
+          }}
           onSelect={swapState.handleSelectedOutputToken}
           disableInput={false}
           selectedAsset={state.destinationToken}
@@ -250,12 +266,12 @@ export const LimitOrderInputs = ({
 
         <PriceInput
           originAsset={state.sourceToken}
+          originAssetAmount={state.inputAmount}
+          originAssetAmountUSD={state.inputAmountUSD}
           targetAsset={state.destinationToken}
+          targetAssetAmount={state.outputAmount}
+          targetAssetAmountUSD={state.outputAmountUSD}
           loading={state.ratesLoading}
-          inputAmount={state.inputAmount}
-          outputAmount={state.outputAmount}
-          inputAmountUSD={state.inputAmountUSD}
-          outputAmountUSD={state.outputAmountUSD}
           handleRateChange={swapState.handleRateChange}
           disabled={!state.swapRate?.srcSpotAmount || !state.swapRate?.destSpotAmount} // No initial rate set yet
         />

src/components/transactions/Swap/inputs/SwapInputs.tsx

@@ -153,13 +153,14 @@ export const SwapInputs = ({
     // User changed custom price, pause quote refresh in limit orders
     setState({ quoteRefreshPaused: true });
 
-    // When rate is changed, new output amount is calculated based on the input amount
-    let newOutputAmount: string;
-    if (rateFromAsset.addressToSwap === state.sourceToken.addressToSwap) {
-      newOutputAmount = valueToBigNumber(state.inputAmount).multipliedBy(newRate).toString();
-    } else {
-      newOutputAmount = valueToBigNumber(state.outputAmount).dividedBy(newRate).toString();
-    }
+    // Normalize the rate to always be dest per 1 source, then recompute output deterministically
+    const isBaseSource = rateFromAsset.addressToSwap === state.sourceToken.addressToSwap;
+    const rateDestPerSrc = isBaseSource
+      ? valueToBigNumber(newRate)
+      : valueToBigNumber(1).dividedBy(newRate);
+    const newOutputAmount = valueToBigNumber(state.inputAmount || '0')
+      .multipliedBy(rateDestPerSrc)
+      .toString();
 
     setState({
       quoteRefreshPaused: false,