commit e89821a6c7f5b740ab5781354149dd2cc2b4047c
parent ddfb40e50cef0abddc7690b23562b1ca5aeb3fdd
Author: Sebastian <sebasjm@gmail.com>
Date: Fri, 25 Mar 2022 17:06:38 -0300
show pending operations on main pages
Diffstat:
3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/packages/taler-wallet-webextension/dev-html/index.html b/packages/taler-wallet-webextension/dev-html/index.html
@@ -34,7 +34,7 @@
<iframe
id="wallet-window"
name="wallet"
- src="about:blank"
+ src="/wallet.html"
name="wallet"
width="800"
height="100%"
diff --git a/packages/taler-wallet-webextension/src/platform/dev.ts b/packages/taler-wallet-webextension/src/platform/dev.ts
@@ -62,7 +62,7 @@ const api: PlatformAPI = ({
},
registerAllIncomingConnections: () => undefined,
- registerOnInstalled: (fn: () => void) => fn(),
+ registerOnInstalled: (fn: () => void) => undefined,
registerReloadOnNewVersion: () => undefined,
registerTalerHeaderListener: () => undefined,
diff --git a/packages/taler-wallet-webextension/src/wallet/Application.tsx b/packages/taler-wallet-webextension/src/wallet/Application.tsx
@@ -83,19 +83,21 @@ export function Application(): VNode {
<Fragment>
<LogoHeader />
<WalletNavBar path={path} />
- <div
- style={{
- backgroundColor: "lightcyan",
- display: "flex",
- justifyContent: "center",
- }}
- >
- <PendingTransactions
- goToTransaction={(txId: string) =>
- route(Pages.balance_transaction.replace(":tid", txId))
- }
- />
- </div>
+ {shouldShowPendingOperations(path) && (
+ <div
+ style={{
+ backgroundColor: "lightcyan",
+ display: "flex",
+ justifyContent: "center",
+ }}
+ >
+ <PendingTransactions
+ goToTransaction={(txId: string) =>
+ route(Pages.balance_transaction.replace(":tid", txId))
+ }
+ />
+ </div>
+ )}
</Fragment>
);
}}
@@ -261,3 +263,7 @@ function Redirect({ to }: { to: string }): null {
});
return null;
}
+
+function shouldShowPendingOperations(path: string): boolean {
+ return ["/balance/history/", "/dev", "/settings", "/backup"].includes(path);
+}