diff --git a/app/components/Nav/Main/MainNavigator.js b/app/components/Nav/Main/MainNavigator.js index 2283808529f0..eece32bb5924 100644 --- a/app/components/Nav/Main/MainNavigator.js +++ b/app/components/Nav/Main/MainNavigator.js @@ -508,6 +508,7 @@ const HomeTabs = () => { ); }, rootScreenName: Routes.BROWSER_VIEW, + unmountOnBlur: true, }, activity: { tabBarIconKey: TabBarIconKey.Activity, @@ -519,6 +520,7 @@ const HomeTabs = () => { ); }, rootScreenName: Routes.TRANSACTIONS_VIEW, + unmountOnBlur: true, }, settings: { tabBarIconKey: TabBarIconKey.Setting, diff --git a/app/components/Views/Browser/index.js b/app/components/Views/Browser/index.js index 607515b18fda..f3a6ea2c309f 100644 --- a/app/components/Views/Browser/index.js +++ b/app/components/Views/Browser/index.js @@ -362,7 +362,7 @@ export const Browser = (props) => { return null; }; - const renderBrowserTabWindows = useCallback(() => tabs.filter((tab) => !tab.isArchived).map((tab) => ( + const renderBrowserTabWindows = useCallback(() => tabs.filter((tab) => !tab.isArchived).map((tab) => activeTabId === tab.id ? ( { isInTabsView={route.params?.showTabs} homePageUrl={homePageUrl()} /> - )), [tabs, route.params?.showTabs, newTab, homePageUrl, updateTabInfo, showTabs]); + ) : null), [tabs, route.params?.showTabs, newTab, homePageUrl, updateTabInfo, showTabs, activeTabId]); return (