From 0036050e1491d59cae52c2fbbe1621f95ad9a4a0 Mon Sep 17 00:00:00 2001
From: ilyaigpetrov <ilyaigpetrov@gmail.com>
Date: Thu, 26 Mar 2020 16:53:12 +0000
Subject: [PATCH] Remove non-working OK button for Edge's options page

---
 .../extension-common/pages/options/src/components/Footer.js   | 4 ++--
 .../src/extension-common/pages/options/src/index.js           | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/Footer.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/Footer.js
index 4476546..51dee19 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/Footer.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/Footer.js
@@ -1,7 +1,7 @@
 import Inferno from 'inferno';
 import css from 'csjs-inject';
 
-export default function getFooter() {
+export default function getFooter(theState) {
 
   const scopedCss = css`
 
@@ -26,7 +26,7 @@ export default function getFooter() {
       </section>
 
       <footer class={scopedCss.controlRow + ' horFlex nowrap'}>
-        <input type="button" value={chrome.i18n.getMessage('Finish')} disabled={props.ifInputsDisabled} onClick={() => window.close()} />
+        <input type="button" value={chrome.i18n.getMessage('Finish')} disabled={props.ifInputsDisabled} style={{ display: theState.flags.ifInsideEdgeOptionsPage ? 'none' : 'initial' }} onClick={() => window.close()} />
         <a href="https://rebrand.ly/ac-donate">{chrome.i18n.getMessage('Donate')}</a>
         <a data-in-bg="false" href="../troubleshoot/index.html">
           {chrome.i18n.getMessage('ProblemsQ')}
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js
index 12027e3..3c72105 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js
@@ -42,7 +42,9 @@ chrome.runtime.getBackgroundPage( (bgWindow) =>
       );
       winChrome.runtime.sendMessage({ currentTab, eventName: 'POPUP_OPENED' });
 
-      theState.flags.ifInsideOptionsPage = !currentTab || currentTab.url.startsWith('chrome://extensions/?options=') || currentTab.url.startsWith('about:addons');
+      theState.flags.ifInsideOptionsPage = !currentTab || /.*:\/\/extensions\/\?options=/g.test(currentTab.url) || currentTab.url.startsWith('about:addons');
+      theState.flags.ifInsideEdgeOptionsPage = theState.flags.ifInsideOptionsPage && currentTab.url.startsWith('edge://');
+
       theState.currentTab = currentTab;
 
       // If opened not via popup and not via options modal.