execute sending message to background before window.open()

AdguardTeam · Jan 25, 2024 · ce06236 · ce06236
1 parent 8a5e5c1
commit ce06236
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/options/components/Sidebar/Rate/Rate.tsx b/src/options/components/Sidebar/Rate/Rate.tsx
@@ -20,16 +20,16 @@ export const Rate = observer(() => {
         await hideRate();
     };
 
-    const handleChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
+    const handleChange = async (e: React.ChangeEvent<HTMLInputElement>): Promise<void> => {
         const { value } = e.target;
 
+        await handleHideRate();
+
         if (value && parseInt(value, 10) >= 4) {
             window.open(OPTIONS_STORE_URL, '_blank');
         } else {
             window.open(FEEDBACK_URL, '_blank');
         }
-
-        handleHideRate();
     };
 
     if (!isRateVisible) {

diff --git a/src/popup/components/RatePopup/RatePopup.tsx b/src/popup/components/RatePopup/RatePopup.tsx
@@ -23,16 +23,17 @@ export const RatePopup = observer(() => {
     const handleChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
         const { value } = e.target;
 
+        // wait until the message is sent to the background and execute it before opening the new tab
+        // because window.open() may close the popup and abort the message sending in some browsers
+        // https://github.com/AdguardTeam/AdGuardVPNExtension/issues/150
+        await handleHideRate();
+
         if (value && parseInt(value, 10) >= 4) {
             window.open(POPUP_STORE_URL, '_blank');
         } else {
             window.open(FEEDBACK_URL, '_blank');
         }
 
-        // wait until the message is sent to the background
-        // https://github.com/AdguardTeam/AdGuardVPNExtension/issues/150
-        await handleHideRate();
-
         // close popup after click on rate star
         window.close();
     };