summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian <sebasjm@gmail.com>2024-03-10 16:52:45 -0300
committerSebastian <sebasjm@gmail.com>2024-03-10 16:53:10 -0300
commit3f4a49b92e449f4d923f7633d5126e34f96099cf (patch)
treef83e9707c8877f1209e66af27766dfc559283fdb
parent5a193a0575af3358627dba56055ebc98580c18bb (diff)
downloadwallet-core-3f4a49b92e449f4d923f7633d5126e34f96099cf.tar.gz
wallet-core-3f4a49b92e449f4d923f7633d5126e34f96099cf.tar.bz2
wallet-core-3f4a49b92e449f4d923f7633d5126e34f96099cf.zip
balance
-rw-r--r--packages/bank-ui/src/pages/WireTransfer.tsx9
-rw-r--r--packages/bank-ui/src/pages/admin/AccountList.tsx47
2 files changed, 29 insertions, 27 deletions
diff --git a/packages/bank-ui/src/pages/WireTransfer.tsx b/packages/bank-ui/src/pages/WireTransfer.tsx
index 33f067e63..a3f7d6bc0 100644
--- a/packages/bank-ui/src/pages/WireTransfer.tsx
+++ b/packages/bank-ui/src/pages/WireTransfer.tsx
@@ -80,15 +80,22 @@ export function WireTransfer({
const balanceIsDebit = data.balance.credit_debit_indicator == "debit";
const debitThreshold = Amounts.parseOrThrow(data.debit_threshold);
+
+ if (!balance) return <Fragment />;
+
const limit = balanceIsDebit
? Amounts.sub(debitThreshold, balance).amount
: Amounts.add(balance, debitThreshold).amount;
- if (!balance) return <Fragment />;
+
+ const positiveBalance = balanceIsDebit
+ ? Amounts.zeroOfAmount(balance)
+ : balance;
return (
<PaytoWireTransferForm
title={i18n.str`Make a wire transfer`}
withAccount={toAccount}
withAmount={withAmount}
+ balance={positiveBalance}
withSubject={withSubject}
routeHere={routeHere}
limit={limit}
diff --git a/packages/bank-ui/src/pages/admin/AccountList.tsx b/packages/bank-ui/src/pages/admin/AccountList.tsx
index 4e465d4b5..8a692aaed 100644
--- a/packages/bank-ui/src/pages/admin/AccountList.tsx
+++ b/packages/bank-ui/src/pages/admin/AccountList.tsx
@@ -74,11 +74,6 @@ export function AccountList({
<h1 class="text-base font-semibold leading-6 text-gray-900">
<i18n.Translate>Accounts</i18n.Translate>
</h1>
- <p class="mt-2 text-sm text-gray-700">
- <i18n.Translate>
- A list of all bank accounts.
- </i18n.Translate>
- </p>
</div>
<div class="mt-4 sm:ml-16 sm:mt-0 sm:flex-none">
<a
@@ -213,28 +208,28 @@ export function AccountList({
)}
</div>
<nav
- class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6 rounded-lg"
- aria-label="Pagination"
- >
- <div class="flex flex-1 justify-between sm:justify-end">
- <button
- name="first page"
- class="relative disabled:bg-gray-100 disabled:text-gray-500 inline-flex items-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus-visible:outline-offset-0"
- disabled={!onGoStart}
- onClick={onGoStart}
+ class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6 rounded-lg"
+ aria-label="Pagination"
>
- <i18n.Translate>First page</i18n.Translate>
- </button>
- <button
- name="next page"
- class="relative disabled:bg-gray-100 disabled:text-gray-500 ml-3 inline-flex items-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus-visible:outline-offset-0"
- disabled={!onGoNext}
- onClick={onGoNext}
- >
- <i18n.Translate>Next</i18n.Translate>
- </button>
- </div>
- </nav>
+ <div class="flex flex-1 justify-between sm:justify-end">
+ <button
+ name="first page"
+ class="relative disabled:bg-gray-100 disabled:text-gray-500 inline-flex items-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus-visible:outline-offset-0"
+ disabled={!onGoStart}
+ onClick={onGoStart}
+ >
+ <i18n.Translate>First page</i18n.Translate>
+ </button>
+ <button
+ name="next page"
+ class="relative disabled:bg-gray-100 disabled:text-gray-500 ml-3 inline-flex items-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus-visible:outline-offset-0"
+ disabled={!onGoNext}
+ onClick={onGoNext}
+ >
+ <i18n.Translate>Next</i18n.Translate>
+ </button>
+ </div>
+ </nav>
</div>
</div>