[pull] main from MetaMask:main

app/component-library/components-temp/MultichainAccounts/MultichainAccountSelectorList/MultichainAccountSelectorList.tsx

@@ -151,6 +151,20 @@ const MultichainAccountSelectorList = ({
     return items;
   }, [filteredWalletSections]);
 
+  // Reset scroll to top when search text changes
+  useEffect(() => {
+    if (listRefToUse.current) {
+      // Use requestAnimationFrame to ensure the list has finished re-rendering
+      const animationFrameId = requestAnimationFrame(() => {
+        listRefToUse.current?.scrollToOffset({ offset: 0, animated: false });
+      });
+
+      return () => {
+        cancelAnimationFrame(animationFrameId);
+      };
+    }
+  }, [debouncedSearchText, listRefToUse]);
+
   // Listen for account creation and scroll to new account
   useEffect(() => {
     if (lastCreatedAccountId && listRefToUse.current) {

app/component-library/components/Skeleton/Skeleton.tsx

@@ -30,10 +30,6 @@ const Skeleton: React.FC<SkeletonProps> = ({
   });
 
   const startAnimation = () => {
-    // On E2E, we don't want to animate the skeleton otherwise recurring timers will be ON.
-    if (isE2E) {
-      return;
-    }
     Animated.sequence([
       Animated.timing(opacityAnim, {
         toValue: 0.1,
@@ -56,7 +52,7 @@ const Skeleton: React.FC<SkeletonProps> = ({
 
   useEffect(() => {
     // Only start animation if no children are present or if children should be hidden
-    if (!children || hideChildren) {
+    if (!isE2E && (!children || hideChildren)) {
       startAnimation();
     }
 

app/components/UI/AddCustomCollectible/__snapshots__/index.test.tsx.snap

@@ -27,6 +27,11 @@ exports[`AddCustomCollectible should render correctly 1`] = `
     }
   }
 >
-  <AddCustomCollectible />
+  <AddCustomCollectible
+    networkClientId=""
+    networkId=""
+    selectedNetwork=""
+    setOpenNetworkSelector={[MockFunction]}
+  />
 </ContextProvider>
 `;