[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] branch master updated: bank prebuilt
From: |
gnunet |
Subject: |
[taler-wallet-core] branch master updated: bank prebuilt |
Date: |
Thu, 02 Mar 2023 18:43:25 +0100 |
This is an automated email from the git hooks/post-receive script.
sebasjm pushed a commit to branch master
in repository wallet-core.
The following commit(s) were added to refs/heads/master by this push:
new 5f7a09e8d bank prebuilt
5f7a09e8d is described below
commit 5f7a09e8da51538e714c4ab382cabcf6b7ae5117
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Thu Mar 2 14:43:08 2023 -0300
bank prebuilt
---
Makefile | 12 ++++++++++++
...-backend-into-rebuilt.sh => copy-backend-into-prebuilt.sh | 0
copy-demobank-into-prebuilt.sh | 8 ++++++++
packages/taler-wallet-webextension/package.json | 2 +-
.../src/cta/TransferPickup/state.ts | 6 ------
.../taler-wallet-webextension/src/wallet/Application.tsx | 6 +++---
6 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 035c385e9..66c2bf6c3 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,18 @@ backoffice-prebuilt:
pnpm run --filter @gnu-taler/merchant-backoffice-ui... build
./copy-backoffice-into-prebuilt.sh
+.PHONY: backend-prebuilt
+backend-prebuilt:
+ pnpm install --frozen-lockfile --filter
@gnu-taler/merchant-backend-ui...
+ pnpm run --filter @gnu-taler/merchant-backend... build
+ ./copy-backend-into-prebuilt.sh
+
+.PHONY: demobank-prebuilt
+demobank-prebuilt:
+ pnpm install --frozen-lockfile --filter @gnu-taler/merchant-ba...
+ pnpm run --filter @gnu-taler/demobank-ui... build
+ ./copy-demobank-into-prebuilt.sh
+
# make documentation from docstrings
.PHONY: typedoc
typedoc:
diff --git a/copy-backend-into-rebuilt.sh b/copy-backend-into-prebuilt.sh
similarity index 100%
rename from copy-backend-into-rebuilt.sh
rename to copy-backend-into-prebuilt.sh
diff --git a/copy-demobank-into-prebuilt.sh b/copy-demobank-into-prebuilt.sh
new file mode 100755
index 000000000..5927eac96
--- /dev/null
+++ b/copy-demobank-into-prebuilt.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+[ ! -d prebuilt ] && echo 'directory "prebuilt" not found. first checkout the
prebuilt branch into a prebuilt directory' && exit 1
+
+for file in index.html index.js index.css; do
+ cp packages/demobank-ui/dist/$file prebuilt/demobank/
+done
+
diff --git a/packages/taler-wallet-webextension/package.json
b/packages/taler-wallet-webextension/package.json
index 4dcbfa117..2013da1a4 100644
--- a/packages/taler-wallet-webextension/package.json
+++ b/packages/taler-wallet-webextension/package.json
@@ -13,7 +13,7 @@
"test": "pnpm compile && mocha --require source-map-support/register
'dist/**/*.test.js' 'dist/**/test.js'",
"test:coverage": "nyc pnpm test",
"compile": "tsc && ./build-fast-with-linaria.mjs",
- "prepare": "pnpm compile",
+ "prepare": "tsc",
"dev": "./dev.mjs",
"pretty": "prettier --write src",
"i18n:extract": "pogen extract",
diff --git a/packages/taler-wallet-webextension/src/cta/TransferPickup/state.ts
b/packages/taler-wallet-webextension/src/cta/TransferPickup/state.ts
index 986354bad..0d873b61f 100644
--- a/packages/taler-wallet-webextension/src/cta/TransferPickup/state.ts
+++ b/packages/taler-wallet-webextension/src/cta/TransferPickup/state.ts
@@ -55,12 +55,6 @@ export function useComponentState({
),
};
}
- // if (hook.hasError) {
- // return {
- // status: "loading-uri",
- // error: hook,
- // };
- // }
const {
contractTerms,
diff --git a/packages/taler-wallet-webextension/src/wallet/Application.tsx
b/packages/taler-wallet-webextension/src/wallet/Application.tsx
index bc6678a21..f29c169d0 100644
--- a/packages/taler-wallet-webextension/src/wallet/Application.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Application.tsx
@@ -376,15 +376,15 @@ export function Application(): VNode {
<Route
path={Pages.ctaDeposit}
component={({
- amountStr,
+ amount,
talerDepositUri,
}: {
- amountStr: string;
+ amount: string;
talerDepositUri: string;
}) => (
<CallToActionTemplate title={i18n.str`Digital cash deposit`}>
<DepositPageCTA
- amountStr={amountStr}
+ amountStr={amount}
talerDepositUri={talerDepositUri}
cancel={() => redirectTo(Pages.balance)}
onSuccess={(tid: string) =>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-wallet-core] branch master updated: bank prebuilt,
gnunet <=