Merge branch 'master' into @daniel/pol-migration

rainbow-me · Sep 13, 2024 · 2ed9c6b · 2ed9c6b
2 parents 7eb159f + 09bb6aa
commit 2ed9c6b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/entries/popup/pages/swap/index.tsx b/src/entries/popup/pages/swap/index.tsx
@@ -799,7 +799,9 @@ export function Swap({ bridge = false }: { bridge?: boolean }) {
                   }
                   setAssetToSellInputValue={setAssetToSellInputValue}
                   inputRef={assetToSellInputRef}
-                  openDropdownOnMount={inputToOpenOnMount === 'sell'}
+                  openDropdownOnMount={
+                    inputToOpenOnMount === 'sell' && !assetToSell
+                  }
                   assetToSellNativeValue={assetToSellNativeValue}
                   assetToSellNativeDisplay={assetToSellNativeDisplay}
                   setAssetToSellInputNativeValue={
@@ -881,7 +883,9 @@ export function Swap({ bridge = false }: { bridge?: boolean }) {
                   assetToSellValue={assetToSellValue}
                   setAssetToBuyInputValue={setAssetToBuyInputValue}
                   inputRef={assetToBuyInputRef}
-                  openDropdownOnMount={inputToOpenOnMount === 'buy'}
+                  openDropdownOnMount={
+                    inputToOpenOnMount === 'buy' && !assetToBuy
+                  }
                   inputDisabled={isCrosschainSwap}
                   assetToBuyNativeDisplay={assetToBuyNativeDisplay}
                   assetToSellNativeDisplay={assetToSellNativeDisplay}