diff options
author | Florian Dold <florian.dold@gmail.com> | 2020-08-12 12:41:00 +0530 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2020-08-12 12:41:00 +0530 |
commit | f180d0580457e1e9bd502293df327dfe138dd422 (patch) | |
tree | 11b9eecb7a74acf7cfe36ccbc3366905718d8a1d /packages/taler-wallet-webextension/src/pages | |
parent | 0050bf005a40cab3b4fdc43f2960025e8d52e176 (diff) | |
download | wallet-core-f180d0580457e1e9bd502293df327dfe138dd422.tar.xz |
remove excessive namespacing, format
Diffstat (limited to 'packages/taler-wallet-webextension/src/pages')
5 files changed, 25 insertions, 28 deletions
diff --git a/packages/taler-wallet-webextension/src/pages/pay.tsx b/packages/taler-wallet-webextension/src/pages/pay.tsx index b876a9c58..1e1f91caf 100644 --- a/packages/taler-wallet-webextension/src/pages/pay.tsx +++ b/packages/taler-wallet-webextension/src/pages/pay.tsx @@ -30,10 +30,10 @@ import * as wxApi from "../wxApi"; import React, { useState, useEffect } from "react"; -import { Amounts, AmountJson, walletTypes, talerTypes } from "taler-wallet-core"; +import { Amounts, AmountJson, PreparePayResult, PreparePayResultType, ContractTerms, codecForContractTerms, ConfirmPayResultType } from "taler-wallet-core"; function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element { - const [payStatus, setPayStatus] = useState<walletTypes.PreparePayResult | undefined>(); + const [payStatus, setPayStatus] = useState<PreparePayResult | undefined>(); const [payErrMsg, setPayErrMsg] = useState<string | undefined>(""); const [numTries, setNumTries] = useState(0); const [loading, setLoading] = useState(false); @@ -60,7 +60,7 @@ function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element { amountEffective = Amounts.parseOrThrow(payStatus.amountEffective); } - if (payStatus.status === walletTypes.PreparePayResultType.AlreadyConfirmed && numTries === 0) { + if (payStatus.status === PreparePayResultType.AlreadyConfirmed && numTries === 0) { return ( <span> You have already paid for this article. Click{" "} @@ -69,10 +69,10 @@ function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element { ); } - let contractTerms: talerTypes.ContractTerms; + let contractTerms: ContractTerms; try { - contractTerms = talerTypes.codecForContractTerms().decode(payStatus.contractTerms); + contractTerms = codecForContractTerms().decode(payStatus.contractTerms); } catch (e) { // This should never happen, as the wallet is supposed to check the contract terms // before storing them. @@ -109,7 +109,7 @@ function TalerPayDialog({ talerPayUri }: { talerPayUri: string }): JSX.Element { try { setLoading(true); const res = await wxApi.confirmPay(proposalId, undefined); - if (res.type !== walletTypes.ConfirmPayResultType.Done) { + if (res.type !== ConfirmPayResultType.Done) { throw Error("payment pending"); } document.location.href = res.nextUrl; diff --git a/packages/taler-wallet-webextension/src/pages/popup.tsx b/packages/taler-wallet-webextension/src/pages/popup.tsx index 72c9f4bcb..61edcfe50 100644 --- a/packages/taler-wallet-webextension/src/pages/popup.tsx +++ b/packages/taler-wallet-webextension/src/pages/popup.tsx @@ -29,9 +29,10 @@ import * as i18n from "../i18n"; import { AmountJson, Amounts, - time, - taleruri, - walletTypes, + BalancesResponse, + Balance, + classifyTalerUri, + TalerUriType, } from "taler-wallet-core"; @@ -174,7 +175,7 @@ function EmptyBalanceView(): JSX.Element { } class WalletBalanceView extends React.Component<any, any> { - private balance?: walletTypes.BalancesResponse; + private balance?: BalancesResponse; private gotError = false; private canceler: (() => void) | undefined = undefined; private unmount = false; @@ -198,7 +199,7 @@ class WalletBalanceView extends React.Component<any, any> { return; } this.updateBalanceRunning = true; - let balance: walletTypes.BalancesResponse; + let balance: BalancesResponse; try { balance = await wxApi.getBalance(); } catch (e) { @@ -221,7 +222,7 @@ class WalletBalanceView extends React.Component<any, any> { this.setState({}); } - formatPending(entry: walletTypes.Balance): JSX.Element { + formatPending(entry: Balance): JSX.Element { let incoming: JSX.Element | undefined; let payment: JSX.Element | undefined; @@ -393,25 +394,25 @@ function makeExtensionUrlWithParams( } function actionForTalerUri(talerUri: string): string | undefined { - const uriType = taleruri.classifyTalerUri(talerUri); + const uriType = classifyTalerUri(talerUri); switch (uriType) { - case taleruri.TalerUriType.TalerWithdraw: + case TalerUriType.TalerWithdraw: return makeExtensionUrlWithParams("withdraw.html", { talerWithdrawUri: talerUri, }); - case taleruri.TalerUriType.TalerPay: + case TalerUriType.TalerPay: return makeExtensionUrlWithParams("pay.html", { talerPayUri: talerUri, }); - case taleruri.TalerUriType.TalerTip: + case TalerUriType.TalerTip: return makeExtensionUrlWithParams("tip.html", { talerTipUri: talerUri, }); - case taleruri.TalerUriType.TalerRefund: + case TalerUriType.TalerRefund: return makeExtensionUrlWithParams("refund.html", { talerRefundUri: talerUri, }); - case taleruri.TalerUriType.TalerNotifyReserve: + case TalerUriType.TalerNotifyReserve: // FIXME: implement break; default: diff --git a/packages/taler-wallet-webextension/src/pages/refund.tsx b/packages/taler-wallet-webextension/src/pages/refund.tsx index 7326dfc88..b34b98f63 100644 --- a/packages/taler-wallet-webextension/src/pages/refund.tsx +++ b/packages/taler-wallet-webextension/src/pages/refund.tsx @@ -21,15 +21,14 @@ */ import React, { useEffect, useState } from "react"; - import * as wxApi from "../wxApi"; import { AmountView } from "../renderHtml"; -import { walletTypes } from "taler-wallet-core"; +import { PurchaseDetails } from "taler-wallet-core"; function RefundStatusView(props: { talerRefundUri: string }): JSX.Element { const [applied, setApplied] = useState(false); const [purchaseDetails, setPurchaseDetails] = useState< - walletTypes.PurchaseDetails | undefined + PurchaseDetails | undefined >(undefined); const [errMsg, setErrMsg] = useState<string | undefined>(undefined); diff --git a/packages/taler-wallet-webextension/src/pages/tip.tsx b/packages/taler-wallet-webextension/src/pages/tip.tsx index 6cf4e1875..1f164ad1b 100644 --- a/packages/taler-wallet-webextension/src/pages/tip.tsx +++ b/packages/taler-wallet-webextension/src/pages/tip.tsx @@ -22,16 +22,13 @@ */ import * as React from "react"; - import { acceptTip, getTipStatus } from "../wxApi"; - import { renderAmount, ProgressButton } from "../renderHtml"; - import { useState, useEffect } from "react"; -import { walletTypes } from "taler-wallet-core"; +import { TipStatus } from "taler-wallet-core"; function TipDisplay(props: { talerTipUri: string }): JSX.Element { - const [tipStatus, setTipStatus] = useState<walletTypes.TipStatus | undefined>(undefined); + const [tipStatus, setTipStatus] = useState<TipStatus | undefined>(undefined); const [discarded, setDiscarded] = useState(false); const [loading, setLoading] = useState(false); const [finished, setFinished] = useState(false); diff --git a/packages/taler-wallet-webextension/src/pages/welcome.tsx b/packages/taler-wallet-webextension/src/pages/welcome.tsx index ff5de572c..00d8ae6c7 100644 --- a/packages/taler-wallet-webextension/src/pages/welcome.tsx +++ b/packages/taler-wallet-webextension/src/pages/welcome.tsx @@ -26,11 +26,11 @@ import { PageLink } from "../renderHtml"; import * as wxApi from "../wxApi"; import { getPermissionsApi } from "../compat"; import { extendedPermissions } from "../permissions"; -import { walletTypes } from "taler-wallet-core"; +import { WalletDiagnostics } from "taler-wallet-core"; function Diagnostics(): JSX.Element | null { const [timedOut, setTimedOut] = useState(false); - const [diagnostics, setDiagnostics] = useState<walletTypes.WalletDiagnostics | undefined>( + const [diagnostics, setDiagnostics] = useState<WalletDiagnostics | undefined>( undefined, ); |