@@ -799,7 +807,7 @@ async function confirmReset(): Promise { } } -function WalletDebug(props: any): JSX.Element { +export function WalletDebug(props: any): JSX.Element { return (

Debug tools:

@@ -845,23 +853,23 @@ function makeExtensionUrlWithParams( return innerUrl.href; } -function actionForTalerUri(talerUri: string): string | undefined { +export function actionForTalerUri(talerUri: string): string | undefined { const uriType = classifyTalerUri(talerUri); switch (uriType) { case TalerUriType.TalerWithdraw: - return makeExtensionUrlWithParams("static/popup.html#/withdraw", { + return makeExtensionUrlWithParams("static/wallet.html#/withdraw", { talerWithdrawUri: talerUri, }); case TalerUriType.TalerPay: - return makeExtensionUrlWithParams("static/popup.html#/pay", { + return makeExtensionUrlWithParams("static/wallet.html#/pay", { talerPayUri: talerUri, }); case TalerUriType.TalerTip: - return makeExtensionUrlWithParams("static/popup.html#/tip", { + return makeExtensionUrlWithParams("static/wallet.html#/tip", { talerTipUri: talerUri, }); case TalerUriType.TalerRefund: - return makeExtensionUrlWithParams("static/popup.html#/refund", { + return makeExtensionUrlWithParams("static/wallet.html#/refund", { talerRefundUri: talerUri, }); case TalerUriType.TalerNotifyReserve: @@ -876,7 +884,7 @@ function actionForTalerUri(talerUri: string): string | undefined { return undefined; } -async function findTalerUriInActiveTab(): Promise { +export async function findTalerUriInActiveTab(): Promise { return new Promise((resolve, reject) => { chrome.tabs.executeScript( { @@ -901,68 +909,54 @@ async function findTalerUriInActiveTab(): Promise { }); } -export function WalletPopup(): JSX.Element { - const [talerActionUrl, setTalerActionUrl] = useState( - undefined, - ); - const [dismissed, setDismissed] = useState(false); - useEffect(() => { - async function check(): Promise { - const talerUri = await findTalerUriInActiveTab(); - if (talerUri) { - const actionUrl = actionForTalerUri(talerUri); - setTalerActionUrl(actionUrl); - } - } - check(); - }, []); - if (talerActionUrl && !dismissed) { - return ( -

Taler Action

This page has a Taler action.

- -

- ); - } - return ( -

- {({ path }: any) => } -

- - - - - - - -

- ); -} - -enum Pages { - balance = '/popup/balance', - transaction = '/popup/transaction/:tid', - settings = '/popup/settings', - debug = '/popup/debug', - history = '/popup/history', -} +// export function WalletPopup(): JSX.Element { +// const [talerActionUrl, setTalerActionUrl] = useState( +// undefined, +// ); +// const [dismissed, setDismissed] = useState(false); +// useEffect(() => { +// async function check(): Promise { +// const talerUri = await findTalerUriInActiveTab(); +// if (talerUri) { +// const actionUrl = actionForTalerUri(talerUri); +// setTalerActionUrl(actionUrl); +// } +// } +// check(); +// }, []); +// if (talerActionUrl && !dismissed) { +// return ( +//

+//

Taler Action

+//

This page has a Taler action.

+//

+// +//

+//

+// +//

+//

+// ); +// } +// return ( +//

+// {({ path }: any) => } +//

+// +// +// +// +// +// +// +//

+//

+// ); +// } -export function Redirect({ to }: { to: string }): null { - useEffect(() => { - route(to, true) - }) - return null -} diff --git a/packages/taler-wallet-webextension/src/pages/withdraw.tsx b/packages/taler-wallet-webextension/src/pages/withdraw.tsx index e0b7ccdc9..cb96fa4df 100644 --- a/packages/taler-wallet-webextension/src/pages/withdraw.tsx +++ b/packages/taler-wallet-webextension/src/pages/withdraw.tsx @@ -48,6 +48,10 @@ export interface ViewProps { }; export function View({ talerWithdrawUri, details, cancelled, selectedExchange, accept, setCancelled, setSelecting }: ViewProps) { + const [state, setState] = useState(1) + setTimeout(() => { + setState(s => s + 1) + }, 1000); if (!talerWithdrawUri) { return missing withdraw uri; } @@ -57,7 +61,7 @@ export function View({ talerWithdrawUri, details, cancelled, selectedExchange, a } if (cancelled) { - return Withdraw operation has been cancelled.; + return Withdraw operation has been cancelled.{state}; } return ( diff --git a/packages/taler-wallet-webextension/src/popupEntryPoint.tsx b/packages/taler-wallet-webextension/src/popupEntryPoint.tsx new file mode 100644 index 000000000..0ef5a4896 --- /dev/null +++ b/packages/taler-wallet-webextension/src/popupEntryPoint.tsx @@ -0,0 +1,128 @@ +/* + This file is part of GNU Taler + (C) 2020 Taler Systems S.A. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +/** + * Main entry point for extension pages. + * + * @author Florian Dold + */ + +import { render } from "preact"; +import { setupI18n } from "@gnu-taler/taler-util"; +import { strings } from "./i18n/strings"; +import { useEffect, useState } from "preact/hooks"; +import { + actionForTalerUri, findTalerUriInActiveTab, Pages, WalletBalanceView, WalletDebug, WalletHistory, + WalletNavBar, WalletSettings, WalletTransaction, WalletTransactionView +} from "./pages/popup"; +import Match from "preact-router/match"; +import Router, { route, Route } from "preact-router"; +// import { Application } from "./Application"; + +function main(): void { + try { + const container = document.getElementById("container"); + if (!container) { + throw Error("container not found, can't mount page contents"); + } + render(, container); + } catch (e) { + console.error("got error", e); + document.body.innerText = `Fatal error: "${e.message}". Please report this bug at https://bugs.gnunet.org/.`; + } +} + +setupI18n("en-US", strings); + +if (document.readyState === "loading") { + document.addEventListener("DOMContentLoaded", main); +} else { + main(); +} + +function useTalerActionURL(): [string | undefined, (s: boolean) => void] { + const [talerActionUrl, setTalerActionUrl] = useState( + undefined, + ); + const [dismissed, setDismissed] = useState(false); + useEffect(() => { + async function check(): Promise { + const talerUri = await findTalerUriInActiveTab(); + if (talerUri) { + const actionUrl = actionForTalerUri(talerUri); + setTalerActionUrl(actionUrl); + } + } + check(); + }, []); + const url = dismissed ? undefined : talerActionUrl + return [url, setDismissed] +} + +interface Props { + url: string; + onDismiss: (s: boolean) => void; +} + +function TalerActionFound({ url, onDismiss }: Props) { + return