Reality2byte
diff --git a/‎app/components/Nav/Main/MainNavigator.js‎
Lines changed: 23 additions & 11 deletions b/‎app/components/Nav/Main/MainNavigator.js‎
Lines changed: 23 additions & 11 deletions
diff --git a/‎app/components/Views/BrowserTab/BrowserTab.tsx‎
Lines changed: 46 additions & 26 deletions b/‎app/components/Views/BrowserTab/BrowserTab.tsx‎
Lines changed: 46 additions & 26 deletions
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useMemo } from 'react';
+import React, { useState, useEffect, useMemo, useCallback } from 'react';
 import { Image, StyleSheet, Keyboard, Platform } from 'react-native';
 import { createStackNavigator } from '@react-navigation/stack';
 import { useSelector } from 'react-redux';
@@ -271,6 +271,15 @@ const RewardsHome = () => (
   </Stack.Navigator>
 );
 
+// Persist the last trending screen across unmounts
+export const lastTrendingScreenRef = { current: 'TrendingFeed' };
+
+// Callback to update the last trending screen (outside component to persist)
+export const updateLastTrendingScreen = (screenName) => {
+  // eslint-disable-next-line react-compiler/react-compiler
+  lastTrendingScreenRef.current = screenName;
+};
+
 const TrendingHome = () => (
   <Stack.Navigator mode="modal" screenOptions={clearStackNavigatorOptions}>
     <Stack.Screen
@@ -667,23 +676,26 @@ const HomeTabs = () => {
         options={options.home}
         component={WalletTabModalFlow}
       />
-      {isAssetsTrendingTokensEnabled && (
+      {isAssetsTrendingTokensEnabled ? (
         <Tab.Screen
           name={Routes.TRENDING_VIEW}
           options={options.trending}
           component={TrendingHome}
           layout={({ children }) => UnmountOnBlurComponent(children)}
         />
+      ) : (
+        <Tab.Screen
+          name={Routes.BROWSER.HOME}
+          options={{
+            ...options.browser,
+            tabBarButton: isAssetsTrendingTokensEnabled
+              ? () => null
+              : undefined,
+          }}
+          component={BrowserFlow}
+          layout={({ children }) => <UnmountOnBlur>{children}</UnmountOnBlur>}
+        />
       )}
-      <Tab.Screen
-        name={Routes.BROWSER.HOME}
-        options={{
-          ...options.browser,
-          tabBarButton: isAssetsTrendingTokensEnabled ? () => null : undefined,
-        }}
-        component={BrowserFlow}
-        layout={({ children }) => <UnmountOnBlur>{children}</UnmountOnBlur>}
-      />
       <Tab.Screen
         name={Routes.MODAL.TRADE_WALLET_ACTIONS}
         options={options.trade}
 
@@ -122,6 +122,14 @@ import { toHex } from '@metamask/controller-utils';
 import { parseCaipAccountId } from '@metamask/utils';
 import { selectBrowserFullscreen } from '../../../selectors/browser';
 import { selectAssetsTrendingTokensEnabled } from '../../../selectors/featureFlagController/assetsTrendingTokens';
+import {
+  Box,
+  BoxFlexDirection,
+  BoxAlignItems,
+  ButtonIcon,
+  ButtonIconSize,
+  IconName,
+} from '@metamask/design-system-react-native';
 
 /**
  * Tab component for the in-app browser
@@ -1354,24 +1362,19 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
       [],
     );
 
-    const onCancelUrlBar = useCallback(() => {
-      // If from trending and feature flag is on, navigate back to trending
-      if (fromTrending && isAssetsTrendingTokensEnabled) {
-        navigation.navigate(Routes.TRENDING_VIEW);
-        return;
-      }
+    const handleBackPress = useCallback(() => {
+      navigation.navigate('TrendingFeed');
+    }, [navigation]);
 
+    const onCancelUrlBar = useCallback(() => {
       hideAutocomplete();
       // Reset the url bar to the current url
       const hostName =
         new URLParse(resolvedUrlRef.current).origin || resolvedUrlRef.current;
       urlBarRef.current?.setNativeProps({ text: hostName });
-    }, [
-      hideAutocomplete,
-      fromTrending,
-      isAssetsTrendingTokensEnabled,
-      navigation,
-    ]);
+    }, [hideAutocomplete]);
+
+    const showBackButton = isAssetsTrendingTokensEnabled;
 
     const onFocusUrlBar = useCallback(() => {
       // Show the autocomplete results
@@ -1494,20 +1497,37 @@ export const BrowserTab: React.FC<BrowserTabProps> = React.memo(
             style={styles.wrapper}
             {...(Device.isAndroid() ? { collapsable: false } : {})}
           >
-            <BrowserUrlBar
-              ref={urlBarRef}
-              connectionType={connectionType}
-              onSubmitEditing={onSubmitEditing}
-              onCancel={onCancelUrlBar}
-              onFocus={onFocusUrlBar}
-              onBlur={hideAutocomplete}
-              onChangeText={onChangeUrlBar}
-              connectedAccounts={permittedCaipAccountAddressesList}
-              activeUrl={resolvedUrlRef.current}
-              setIsUrlBarFocused={setIsUrlBarFocused}
-              isUrlBarFocused={isUrlBarFocused}
-              showCloseButton={fromTrending && isAssetsTrendingTokensEnabled}
-            />
+            <Box
+              flexDirection={BoxFlexDirection.Row}
+              alignItems={BoxAlignItems.Center}
+            >
+              {showBackButton && (
+                <ButtonIcon
+                  iconName={IconName.ArrowLeft}
+                  size={ButtonIconSize.Lg}
+                  onPress={handleBackPress}
+                  testID="browser-tab-back-button"
+                />
+              )}
+              <Box twClassName="flex-1">
+                <BrowserUrlBar
+                  ref={urlBarRef}
+                  connectionType={connectionType}
+                  onSubmitEditing={onSubmitEditing}
+                  onCancel={onCancelUrlBar}
+                  onFocus={onFocusUrlBar}
+                  onBlur={hideAutocomplete}
+                  onChangeText={onChangeUrlBar}
+                  connectedAccounts={permittedCaipAccountAddressesList}
+                  activeUrl={resolvedUrlRef.current}
+                  setIsUrlBarFocused={setIsUrlBarFocused}
+                  isUrlBarFocused={isUrlBarFocused}
+                  showCloseButton={
+                    fromTrending && isAssetsTrendingTokensEnabled
+                  }
+                />
+              </Box>
+            </Box>
             <View style={styles.wrapper}>
               {renderProgressBar()}
               <View style={styles.webview}>