diff options
3 files changed, 19 insertions, 18 deletions
diff --git a/packages/taler-wallet-webextension/src/permissions.ts b/packages/taler-wallet-webextension/src/permissions.ts index 6b6f99a8e..fe8630805 100644 --- a/packages/taler-wallet-webextension/src/permissions.ts +++ b/packages/taler-wallet-webextension/src/permissions.ts @@ -14,11 +14,7 @@ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> */ -export const getReadRequestPermissions = () => - chrome.runtime.getManifest().manifest_version === 3 ? ({ - permissions: ["webRequest"], - origins: ["http://*/*", "https://*/*"], - }) : ({ - permissions: ["webRequest", "webRequestBlocking"], - origins: ["http://*/*", "https://*/*"], - }); +export const getReadRequestPermissions = () => ({ + permissions: ["webRequest"], + origins: ["http://*/*", "https://*/*"], +})
\ No newline at end of file diff --git a/packages/taler-wallet-webextension/src/walletEntryPoint.tsx b/packages/taler-wallet-webextension/src/walletEntryPoint.tsx index 85e38d85a..dbcf053e2 100644 --- a/packages/taler-wallet-webextension/src/walletEntryPoint.tsx +++ b/packages/taler-wallet-webextension/src/walletEntryPoint.tsx @@ -22,7 +22,7 @@ import { setupI18n } from "@gnu-taler/taler-util"; import { createHashHistory } from "history"; -import { h, render, VNode } from "preact"; +import { Fragment, h, render, VNode } from "preact"; import Router, { route, Route } from "preact-router"; import Match from "preact-router/match"; import { useEffect, useState } from "preact/hooks"; @@ -86,14 +86,19 @@ function Application(): VNode { <DevContextProvider> {({ devMode }: { devMode: boolean }) => ( <IoCProviderForRuntime> - <LogoHeader /> {/* <Match/> won't work in the first render if <Router /> is not called first */} {/* https://github.com/preactjs/preact-router/issues/415 */} <Router history={hash_history} /> <Match> - {({ path }: { path: string }) => ( - <NavBar devMode={devMode} path={path} /> - )} + {({ path }: { path: string }) => { + if (path && path.startsWith("/cta")) return; + return ( + <Fragment> + <LogoHeader /> + <NavBar devMode={devMode} path={path} /> + </Fragment> + ); + }} </Match> <WalletBox> {globalNotification && ( diff --git a/packages/taler-wallet-webextension/src/wxBackend.ts b/packages/taler-wallet-webextension/src/wxBackend.ts index 3feb232d6..085d7045e 100644 --- a/packages/taler-wallet-webextension/src/wxBackend.ts +++ b/packages/taler-wallet-webextension/src/wxBackend.ts @@ -396,10 +396,10 @@ function headerListener( } function setupHeaderListener(): void { - if (chrome.runtime.getManifest().manifest_version === 3) { - console.error("cannot block request on manfest v3") - return - } + // if (chrome.runtime.getManifest().manifest_version === 3) { + // console.error("cannot block request on manfest v3") + // return + // } console.log("setting up header listener"); // Handlers for catching HTTP requests getPermissionsApi().contains(getReadRequestPermissions(), (result: boolean) => { @@ -415,7 +415,7 @@ function setupHeaderListener(): void { chrome.webRequest.onHeadersReceived.addListener( headerListener, { urls: ["<all_urls>"] }, - ["responseHeaders", "blocking"], + ["responseHeaders"] ); } if ("webRequest" in chrome) { |