Merge branch 'main' into fix/metametric-scroll-issue

Author: smgv

ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.stories.tsx

@@ -29,6 +29,7 @@ export const DefaultStory = () => {
     <AssetPickerModal
       header={t('sendSelectSendAsset')}
       onAssetChange={() => ({})}
+      autoFocus={false}
       {...props}
     />
   );
@@ -42,6 +43,7 @@ export const TokenStory = () => {
     <AssetPickerModal
       header={t('sendSelectSendAsset')}
       onAssetChange={() => ({})}
+      autoFocus={false}
       {...props}
     />
   );

ui/components/multichain/asset-picker-amount/asset-picker-modal/asset-picker-modal.tsx

@@ -120,6 +120,7 @@ type AssetPickerModalProps = {
   isTokenListLoading?: boolean;
   autoFocus: boolean;
   isDestinationToken?: boolean;
+  hideSearch?: boolean;
 } & Pick<
   React.ComponentProps<typeof AssetPickerModalTabs>,
   'visibleTabs' | 'defaultActiveTabKey'
@@ -151,6 +152,7 @@ export function AssetPickerModal({
   selectedChainIds,
   autoFocus,
   isDestinationToken = false,
+  hideSearch = false,
   ...tabProps
 }: AssetPickerModalProps) {
   const t = useI18nContext();
@@ -682,15 +684,17 @@ export function AssetPickerModal({
           ) : (
             <AssetPickerModalTabs {...tabProps}>
               <React.Fragment key={TabName.TOKENS}>
-                <Search
-                  searchQuery={searchQuery}
-                  onChange={(value) => {
-                    // Cancel previous asset metadata fetch
-                    abortControllerRef.current?.abort();
-                    setSearchQuery(() => value);
-                  }}
-                  autoFocus={autoFocus}
-                />
+                {!hideSearch && (
+                  <Search
+                    searchQuery={searchQuery}
+                    onChange={(value) => {
+                      // Cancel previous asset metadata fetch
+                      abortControllerRef.current?.abort();
+                      setSearchQuery(() => value);
+                    }}
+                    autoFocus={autoFocus}
+                  />
+                )}
                 <AssetList
                   network={network}
                   handleAssetChange={handleAssetChange}

ui/pages/shield-plan/shield-payment-modal.tsx

@@ -308,6 +308,7 @@ export const ShieldPaymentModal = ({
           autoFocus={false}
           visibleTabs={[TabName.TOKENS]}
           customTokenListGenerator={customTokenListGenerator}
+          hideSearch
         />
       </ModalContent>
     </Modal>