diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/demobank-ui/src/pages/home/index.tsx | 17 | ||||
| -rw-r--r-- | packages/taler-wallet-cli/Makefile | 5 |
2 files changed, 13 insertions, 9 deletions
diff --git a/packages/demobank-ui/src/pages/home/index.tsx b/packages/demobank-ui/src/pages/home/index.tsx index 0eb7e389d..2da48f3ab 100644 --- a/packages/demobank-ui/src/pages/home/index.tsx +++ b/packages/demobank-ui/src/pages/home/index.tsx @@ -31,7 +31,7 @@ import { QR } from "../../components/QR.js"; import { useLocalStorage, useNotNullLocalStorage } from "../../hooks/index.js"; import { Translate, useTranslator } from "../../i18n/index.js"; import "../../scss/main.scss"; -import { Amounts, parsePaytoUri } from "@gnu-taler/taler-util"; +import { Amounts, HttpStatusCode, parsePaytoUri } from "@gnu-taler/taler-util"; interface BankUiSettings { allowRegistrations: boolean; @@ -2119,7 +2119,7 @@ function Account(Props: any): VNode { // revalidateOnFocus: false, // revalidateOnReconnect: false, }); - const [pageState, pageStateSetter] = useContext(PageContext); + const [pageState, setPageState] = useContext(PageContext); const { withdrawalInProgress, withdrawalId, isLoggedIn, talerWithdrawUri } = pageState; const i18n = useTranslator(); @@ -2141,7 +2141,7 @@ function Account(Props: any): VNode { */ switch (error.status) { case 404: { - pageStateSetter((prevState: PageStateType) => ({ + setPageState((prevState: PageStateType) => ({ ...prevState, hasError: true, isLoggedIn: false, @@ -2166,8 +2166,9 @@ function Account(Props: any): VNode { (cache as any).clear(); return <p>Profile not found...</p>; } - case 401: { - pageStateSetter((prevState: PageStateType) => ({ + case HttpStatusCode.Unauthorized: + case HttpStatusCode.Forbidden: { + setPageState((prevState: PageStateType) => ({ ...prevState, hasError: true, isLoggedIn: false, @@ -2178,10 +2179,10 @@ function Account(Props: any): VNode { return <p>Wrong credentials...</p>; } default: { - pageStateSetter((prevState: PageStateType) => ({ + setPageState((prevState: PageStateType) => ({ ...prevState, hasError: true, - // isLoggedIn: false, + isLoggedIn: false, error: { title: i18n`Account information could not be retrieved.`, debug: JSON.stringify(error), @@ -2249,7 +2250,7 @@ function Account(Props: any): VNode { {Props.children} <PaymentOptions backendState={backendState} - pageStateSetter={pageStateSetter} + pageStateSetter={setPageState} /> </CurrencyContext.Provider> </div> diff --git a/packages/taler-wallet-cli/Makefile b/packages/taler-wallet-cli/Makefile index f898d0174..b910a82bd 100644 --- a/packages/taler-wallet-cli/Makefile +++ b/packages/taler-wallet-cli/Makefile @@ -1,7 +1,10 @@ # This Makefile has been placed in the public domain. +-include ../../.config.mk include .config.mk +$(info prefix is $(prefix)) + all: @echo use 'make install' to build and install taler-wallet-cli @@ -22,6 +25,6 @@ install: install -d $(install_target)/node_modules/taler-wallet-cli/dist install ./dist/taler-wallet-cli.js $(install_target)/node_modules/taler-wallet-cli/dist/ install ./dist/taler-wallet-cli.js.map $(install_target)/node_modules/taler-wallet-cli/dist/ - install ./bin/taler-wallet-cli $(install_target)/node_modules/taler-wallet-cli/bin/ + install ./bin/taler-wallet-cli.js $(install_target)/node_modules/taler-wallet-cli/bin/ ln -sf $(install_target)/node_modules/taler-wallet-cli/bin/taler-wallet-cli $(prefix)/bin/taler-wallet-cli endif |