[5.2][Fix] Favourites not showing when home button is pressed in browser tab menu

app/components/Views/BrowserTab/index.js

@@ -356,6 +356,31 @@ export const BrowserTab = (props) => {
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [notifyAllConnections, props.approvedHosts, props.selectedAddress]);
 
+	/**
+	 * Inject home page scripts to get the favourites and set analytics key
+	 */
+	const injectHomePageScripts = async () => {
+		const { current } = webviewRef;
+		const analyticsEnabled = Analytics.getEnabled();
+		const disctinctId = await Analytics.getDistinctId();
+		const homepageScripts = `
+			window.__mmFavorites = ${JSON.stringify(props.bookmarks)};
+			window.__mmSearchEngine = "${props.searchEngine}";
+			window.__mmMetametrics = ${analyticsEnabled};
+			window.__mmDistinctId = "${disctinctId}";
+			window.__mmMixpanelToken = "${MM_MIXPANEL_TOKEN}";
+			(function () {
+				try {
+					window.dispatchEvent(new Event('metamask_onHomepageScriptsInjected'));
+				} catch (e) {
+					//Nothing to do
+				}
+			})()
+		`;
+
+		current.injectJavaScript(homepageScripts);
+	};
+
 	const initializeBackgroundBridge = (urlBridge, isMainFrame) => {
 		const newBridge = new BackgroundBridge({
 			webview: webviewRef,
@@ -381,6 +406,7 @@ export const BrowserTab = (props) => {
 					// Wizard
 					wizardScrollAdjusted,
 					tabId: props.id,
+					injectHomePageScripts,
 				}),
 			isMainFrame,
 		});
@@ -467,25 +493,6 @@ export const BrowserTab = (props) => {
 		return bookmarks.some(({ url: bookmark }) => bookmark === maskedUrl);
 	};
 
-	/**
-	 * Inject home page scripts to get the favourites and set analytics key
-	 */
-	const injectHomePageScripts = async () => {
-		const { current } = webviewRef;
-		if (!current) return;
-		const analyticsEnabled = Analytics.getEnabled();
-		const disctinctId = await Analytics.getDistinctId();
-		const homepageScripts = `
-			window.__mmFavorites = ${JSON.stringify(props.bookmarks)};
-			window.__mmSearchEngine = "${props.searchEngine}";
-			window.__mmMetametrics = ${analyticsEnabled};
-			window.__mmDistinctId = "${disctinctId}";
-			window.__mmMixpanelToken = "${MM_MIXPANEL_TOKEN}";
-		`;
-
-		current.injectJavaScript(homepageScripts);
-	};
-
 	/**
 	 * Show a phishing modal when a url is not allowed
 	 */
@@ -871,9 +878,6 @@ export const BrowserTab = (props) => {
 		}
 
 		icon.current = null;
-		if (isHomepage(nativeEvent.url)) {
-			injectHomePageScripts();
-		}
 
 		// Reset the previous bridges
 		backgroundBridges.current.length && backgroundBridges.current.forEach((bridge) => bridge.onDisconnect());

app/core/RPCMethods/RPCMethodMiddleware.ts

@@ -48,6 +48,7 @@ interface RPCMethodsMiddleParameters {
 	tabId: string;
 	// For WalletConnect
 	isWalletConnect: boolean;
+	injectHomePageScripts: () => void;
 }
 
 export const checkActiveAccountAndChainId = ({ address, chainId, activeAccounts }: any) => {
@@ -118,6 +119,7 @@ export const getRpcMethodMiddleware = ({
 	tabId,
 	// For WalletConnect
 	isWalletConnect,
+	injectHomePageScripts,
 }: RPCMethodsMiddleParameters) =>
 	// all user facing RPC calls not implemented by the provider
 	createAsyncMiddleware(async (req: any, res: any, next: any) => {
@@ -510,6 +512,13 @@ export const getRpcMethodMiddleware = ({
 				res.result = true;
 			},
 
+			metamask_injectHomepageScripts: async () => {
+				if (isHomepage()) {
+					injectHomePageScripts();
+				}
+				res.result = true;
+			},
+
 			/**
 			 * This method is used by the inpage provider to get its state on
 			 * initialization.