From 461ebc27689a6e7dff65ae7345fc8eebf1daf703 Mon Sep 17 00:00:00 2001
From: Vardan Hakobyan <vardan_live@live.com>
Date: Thu, 8 Sep 2022 23:45:32 +0400
Subject: [PATCH] fix: let Android to correctly recognize the NativeMobileWeb
 environment when opening WebView on Android (#1503)

---
 packages/mobile/WebFrame/MessageSender.template.js | 1 +
 packages/mobile/src/MobileWebAppContainer.tsx      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/mobile/WebFrame/MessageSender.template.js b/packages/mobile/WebFrame/MessageSender.template.js
index a7df0e037..9eb076f91 100644
--- a/packages/mobile/WebFrame/MessageSender.template.js
+++ b/packages/mobile/WebFrame/MessageSender.template.js
@@ -3,6 +3,7 @@ class WebProcessMessageSender {
   constructor() {
     this.pendingMessages = []
     window.addEventListener('message', this.handleMessageFromReactNative.bind(this))
+    document.addEventListener('message', this.handleMessageFromReactNative.bind(this))
   }
 
   handleMessageFromReactNative(event) {
diff --git a/packages/mobile/src/MobileWebAppContainer.tsx b/packages/mobile/src/MobileWebAppContainer.tsx
index cf08b5cbb..d5d250329 100644
--- a/packages/mobile/src/MobileWebAppContainer.tsx
+++ b/packages/mobile/src/MobileWebAppContainer.tsx
@@ -57,6 +57,7 @@ export const MobileWebAppContainer = () => {
     constructor() {
       this.pendingMessages = []
       window.addEventListener('message', this.handleMessageFromReactNative.bind(this))
+      document.addEventListener('message', this.handleMessageFromReactNative.bind(this))
     }
 
     handleMessageFromReactNative(event) {
@@ -128,7 +129,7 @@ export const MobileWebAppContainer = () => {
       onMessage={onMessage}
       allowFileAccess={true}
       allowUniversalAccessFromFileURLs={true}
-      injectedJavaScript={injectedJS}
+      injectedJavaScriptBeforeContentLoaded={injectedJS}
     />
   )
   /* eslint-enable @typescript-eslint/no-empty-function */