From 6b63ecc49e4baafcd2833503418bb531025d8054 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 21 Sep 2023 19:43:59 +0200 Subject: [PATCH] -fix botched Balance->WalletBalance rename --- packages/taler-util/src/bank-api-client.ts | 4 ++-- .../src/components/BalanceTable.tsx | 6 +++--- .../src/popup/BalancePage.tsx | 16 ++++++++++------ .../src/wallet/History.tsx | 12 ++++++------ 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/packages/taler-util/src/bank-api-client.ts b/packages/taler-util/src/bank-api-client.ts index 164cd333d..facb02ea8 100644 --- a/packages/taler-util/src/bank-api-client.ts +++ b/packages/taler-util/src/bank-api-client.ts @@ -154,7 +154,7 @@ export interface ChallengeContactData { phone?: string; } -export interface Balance { +export interface AccountBalance { amount: AmountString; credit_debit_indicator: "credit" | "debit"; } @@ -204,7 +204,7 @@ export interface AccountData { name: string; // Available balance on the account. - balance: Balance; + balance: AccountBalance; // payto://-URI of the account. payto_uri: string; diff --git a/packages/taler-wallet-webextension/src/components/BalanceTable.tsx b/packages/taler-wallet-webextension/src/components/BalanceTable.tsx index c2cef451b..d3733e6cc 100644 --- a/packages/taler-wallet-webextension/src/components/BalanceTable.tsx +++ b/packages/taler-wallet-webextension/src/components/BalanceTable.tsx @@ -14,15 +14,15 @@ GNU Taler; see the file COPYING. If not, see */ -import { Amounts, Balance } from "@gnu-taler/taler-util"; -import { h, VNode } from "preact"; +import { Amounts, WalletBalance } from "@gnu-taler/taler-util"; +import { VNode, h } from "preact"; import { TableWithRoundRows as TableWithRoundedRows } from "./styled/index.js"; export function BalanceTable({ balances, goToWalletHistory, }: { - balances: Balance[]; + balances: WalletBalance[]; goToWalletHistory: (currency: string) => void; }): VNode { return ( diff --git a/packages/taler-wallet-webextension/src/popup/BalancePage.tsx b/packages/taler-wallet-webextension/src/popup/BalancePage.tsx index a8d2d6fcf..23614e290 100644 --- a/packages/taler-wallet-webextension/src/popup/BalancePage.tsx +++ b/packages/taler-wallet-webextension/src/popup/BalancePage.tsx @@ -14,25 +14,29 @@ GNU Taler; see the file COPYING. If not, see */ -import { Amounts, Balance, NotificationType } from "@gnu-taler/taler-util"; +import { + Amounts, + NotificationType, + WalletBalance, +} from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; -import { Fragment, h, VNode } from "preact"; +import { useTranslationContext } from "@gnu-taler/web-util/browser"; +import { Fragment, VNode, h } from "preact"; import { useEffect, useState } from "preact/hooks"; import { BalanceTable } from "../components/BalanceTable.js"; import { ErrorAlertView } from "../components/CurrentAlerts.js"; import { Loading } from "../components/Loading.js"; import { MultiActionButton } from "../components/MultiActionButton.js"; import { - alertFromError, ErrorAlert, + alertFromError, useAlertContext, } from "../context/alert.js"; import { useBackendContext } from "../context/backend.js"; -import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { useAsyncAsHook } from "../hooks/useAsyncAsHook.js"; import { Button } from "../mui/Button.js"; import { ButtonHandler } from "../mui/handlers.js"; -import { compose, StateViewMap } from "../utils/index.js"; +import { StateViewMap, compose } from "../utils/index.js"; import { AddNewActionView } from "../wallet/AddNewActionView.js"; import { NoBalanceHelp } from "./NoBalanceHelp.js"; @@ -64,7 +68,7 @@ export namespace State { export interface Balances { status: "balance"; error: undefined; - balances: Balance[]; + balances: WalletBalance[]; addAction: ButtonHandler; goToWalletDeposit: (currency: string) => Promise; goToWalletHistory: (currency: string) => Promise; diff --git a/packages/taler-wallet-webextension/src/wallet/History.tsx b/packages/taler-wallet-webextension/src/wallet/History.tsx index 900218991..56d0ef7bd 100644 --- a/packages/taler-wallet-webextension/src/wallet/History.tsx +++ b/packages/taler-wallet-webextension/src/wallet/History.tsx @@ -17,26 +17,26 @@ import { AbsoluteTime, Amounts, - Balance, NotificationType, Transaction, + WalletBalance, } from "@gnu-taler/taler-util"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; -import { Fragment, h, VNode } from "preact"; +import { useTranslationContext } from "@gnu-taler/web-util/browser"; +import { Fragment, VNode, h } from "preact"; import { useEffect, useState } from "preact/hooks"; import { ErrorAlertView } from "../components/CurrentAlerts.js"; +import { HistoryItem } from "../components/HistoryItem.js"; import { Loading } from "../components/Loading.js"; +import { Time } from "../components/Time.js"; import { CenteredBoldText, CenteredText, DateSeparator, NiceSelect, } from "../components/styled/index.js"; -import { Time } from "../components/Time.js"; -import { HistoryItem } from "../components/HistoryItem.js"; import { alertFromError, useAlertContext } from "../context/alert.js"; import { useBackendContext } from "../context/backend.js"; -import { useTranslationContext } from "@gnu-taler/web-util/browser"; import { useAsyncAsHook } from "../hooks/useAsyncAsHook.js"; import { Button } from "../mui/Button.js"; import { NoBalanceHelp } from "../popup/NoBalanceHelp.js"; @@ -109,7 +109,7 @@ export function HistoryView({ goToWalletManualWithdraw: (currency?: string) => Promise; defaultCurrency?: string; transactions: Transaction[]; - balances: Balance[]; + balances: WalletBalance[]; }): VNode { const { i18n } = useTranslationContext(); const { pushAlertOnError } = useAlertContext();