Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: handle sent to self with return transactions #795

Merged
merged 13 commits into from
Nov 6, 2024
Merged

refactor: handle sent to self with return transactions #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
834c31b
refactor: handle sent to self with return transactions
shahin-hq Nov 4, 2024
42d1515
refactor: handle sent to self with return transactions
shahin-hq Nov 4, 2024
aff44e1
refactor: handle sent to self with return transactions
shahin-hq Nov 5, 2024
e7bf2b8
Merge branch 'develop' into refactor/tx-amount-hint
shahin-hq Nov 5, 2024
0bb4c64
wip
shahin-hq Nov 6, 2024
61bdb8c
wip
shahin-hq Nov 6, 2024
a7ca47b
Merge remote-tracking branch 'origin/refactor/tx-amount-hint' into re…
shahin-hq Nov 6, 2024
164ec6d
style: resolve style guide violations
shahin-hq Nov 6, 2024
34fee07
wip
shahin-hq Nov 6, 2024
8931116
Merge remote-tracking branch 'origin/refactor/tx-amount-hint' into re…
shahin-hq Nov 6, 2024
6216784
wip
shahin-hq Nov 6, 2024
49b42a2
style: resolve style guide violations
shahin-hq Nov 6, 2024
e5dda7f
Merge branch 'develop' into refactor/tx-amount-hint
shahin-hq Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...mains/transaction/components/TransactionTable/TransactionRow/TransactionAmount.blocks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@ const calculateReturnedAmount = function (transaction: ExtendedTransactionData):
return returnedAmount;
}

// should return 0 as we don't want to show a hint
if (transaction.isReturn()) {
return returnedAmount;
}

for (const recipient of transaction.recipients().values()) {
if (transaction.isReturn() && transaction.sender() === recipient.address) {
if (transaction.sender() === recipient.address) {
returnedAmount += recipient.amount;
}
}
Expand All @@ -40,7 +45,7 @@ export const TransactionAmountLabel = ({ transaction }: { transaction: ExtendedT
value={amount}
isNegative={isNegative}
ticker={transaction.wallet().currency()}
hideSign={transaction.isTransfer() && transaction.sender() === transaction.recipient()}
hideSign={transaction.isReturn()}
isCompact
hint={
returnedAmount
Expand Down
8 changes: 7 additions & 1 deletion ...domains/transaction/components/TransactionTable/TransactionRow/TransactionBlocks.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe("TransactionAmount.blocks", () => {
...TransactionFixture,
fee: () => 5,
isMultiPayment: () => true,
isReturn: () => true,
isReturn: () => false,
recipients: () => [
{ address: "address-1", amount: 10 },
{ address: "address-2", amount: 20 },
Expand Down Expand Up @@ -44,6 +44,12 @@ describe("TransactionAmount.blocks", () => {
expect(screen.getByText(/35 DARK/)).toBeInTheDocument();
});

it("should not show a hint for a return transaction", () => {
render(<TransactionAmountLabel transaction={{ ...fixture, isReturn: () => true } as any} />);

expect(screen.queryByTestId("AmountLabel__hint")).not.toBeInTheDocument();
});

it("should show fiat value for multiPayment transaction", () => {
const exchangeMock = vi.spyOn(env.exchangeRates(), "exchange").mockReturnValue(5);

Expand Down
4 changes: 2 additions & 2 deletions .../transaction/components/TransactionTable/TransactionRow/TransactionRowAddressing.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ describe("TransactionRowAddressing", () => {
});

it("should render label with the 'Return' prefix if transaction is sent to address itself", () => {
const notSentFixture = { ...fixture, isSent: () => false };
render(<TransactionRowAddressing transaction={notSentFixture as any} profile={profile} />);
const returnFixture = { ...fixture, isReturn: () => true };
render(<TransactionRowAddressing transaction={returnFixture as any} profile={profile} />);

expect(screen.getByTestId("TransactionRowAddressing__label")).toHaveTextContent("Return");
});
Expand Down
8 changes: 4 additions & 4 deletions ...mains/transaction/components/TransactionTable/TransactionRow/TransactionRowAddressing.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ export const TransactionRowAddressing = ({

let direction: Direction = isNegative ? "sent" : "received";

if (transaction.isReturn()) {
direction = "return";
}

const { env } = useEnvironmentContext();
const { t } = useTranslation();
const { getWalletAlias } = useWalletAlias();
Expand Down Expand Up @@ -156,10 +160,6 @@ export const TransactionRowAddressing = ({
);
}

if (transaction.sender() === transaction.recipient()) {
direction = "return";
}

return (
<div className="flex flex-row gap-2" data-testid="TransactionRowAddressing__container">
<TransactionRowLabel direction={direction} />
Expand Down
60 changes: 30 additions & 30 deletions ...ion/components/TransactionTable/TransactionRow/__snapshots__/TransactionRow.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ exports[`TransactionRow > should omit the currency for transactions from test ne
data-testid="TransactionRowAddressing__container"
>
<div
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1kocbuc"
color="secondary"
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1qplu6d"
color="danger-bg"
data-testid="TransactionRowAddressing__label"
>
Return
To
</div>
<div
class="w-50 sm:w-30"
Expand Down Expand Up @@ -124,8 +124,8 @@ exports[`TransactionRow > should omit the currency for transactions from test ne
class="flex flex-col items-end gap-1"
>
<div
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-1vn5kd9"
color="secondary"
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-xqt0aw"
color="danger-bg"
data-testid="AmountLabel__wrapper"
>
<div
Expand All @@ -135,7 +135,7 @@ exports[`TransactionRow > should omit the currency for transactions from test ne
class="whitespace-nowrap text-sm"
data-testid="Amount"
>
121 BTC
- 121 BTC
</span>
</div>
</div>
Expand Down Expand Up @@ -258,11 +258,11 @@ exports[`TransactionRow > should render 1`] = `
data-testid="TransactionRowAddressing__container"
>
<div
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1kocbuc"
color="secondary"
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1qplu6d"
color="danger-bg"
data-testid="TransactionRowAddressing__label"
>
Return
To
</div>
<div
class="w-50 sm:w-40 lg:w-50"
Expand Down Expand Up @@ -308,8 +308,8 @@ exports[`TransactionRow > should render 1`] = `
class="flex flex-col items-end gap-1"
>
<div
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-1vn5kd9"
color="secondary"
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-xqt0aw"
color="danger-bg"
data-testid="AmountLabel__wrapper"
>
<div
Expand All @@ -319,7 +319,7 @@ exports[`TransactionRow > should render 1`] = `
class="whitespace-nowrap text-sm"
data-testid="Amount"
>
121 DARK
- 121 DARK
</span>
</div>
</div>
Expand Down Expand Up @@ -427,11 +427,11 @@ exports[`TransactionRow > should render responsive 1`] = `
data-testid="TransactionRowAddressing__container"
>
<div
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1kocbuc"
color="secondary"
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1qplu6d"
color="danger-bg"
data-testid="TransactionRowAddressing__label"
>
Return
To
</div>
<div
class="w-50 sm:w-40 lg:w-50"
Expand Down Expand Up @@ -481,8 +481,8 @@ exports[`TransactionRow > should render responsive 1`] = `
class="text-sm font-semibold text-theme-secondary-900 dark:text-theme-secondary-200"
>
<div
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-1vn5kd9"
color="secondary"
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-xqt0aw"
color="danger-bg"
data-testid="AmountLabel__wrapper"
>
<div
Expand All @@ -492,7 +492,7 @@ exports[`TransactionRow > should render responsive 1`] = `
class="whitespace-nowrap text-sm"
data-testid="Amount"
>
121 DARK
- 121 DARK
</span>
</div>
</div>
Expand Down Expand Up @@ -596,11 +596,11 @@ exports[`TransactionRow > should render responsive 2`] = `
data-testid="TransactionRowAddressing__container"
>
<div
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1kocbuc"
color="secondary"
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1qplu6d"
color="danger-bg"
data-testid="TransactionRowAddressing__label"
>
Return
To
</div>
<div
class="w-50 sm:w-40 lg:w-50"
Expand Down Expand Up @@ -650,8 +650,8 @@ exports[`TransactionRow > should render responsive 2`] = `
class="text-sm font-semibold text-theme-secondary-900 dark:text-theme-secondary-200"
>
<div
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-1vn5kd9"
color="secondary"
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-xqt0aw"
color="danger-bg"
data-testid="AmountLabel__wrapper"
>
<div
Expand All @@ -661,7 +661,7 @@ exports[`TransactionRow > should render responsive 2`] = `
class="whitespace-nowrap text-sm"
data-testid="Amount"
>
121 DARK
- 121 DARK
</span>
</div>
</div>
Expand Down Expand Up @@ -1023,11 +1023,11 @@ exports[`TransactionRow > should render with currency 1`] = `
data-testid="TransactionRowAddressing__container"
>
<div
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1kocbuc"
color="secondary"
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1qplu6d"
color="danger-bg"
data-testid="TransactionRowAddressing__label"
>
Return
To
</div>
<div
class="w-50 sm:w-30"
Expand Down Expand Up @@ -1062,8 +1062,8 @@ exports[`TransactionRow > should render with currency 1`] = `
class="flex flex-col items-end gap-1"
>
<div
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-1vn5kd9"
color="secondary"
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-xqt0aw"
color="danger-bg"
data-testid="AmountLabel__wrapper"
>
<div
Expand All @@ -1073,7 +1073,7 @@ exports[`TransactionRow > should render with currency 1`] = `
class="whitespace-nowrap text-sm"
data-testid="Amount"
>
121 BTC
- 121 BTC
</span>
</div>
</div>
Expand Down
48 changes: 24 additions & 24 deletions ...mponents/TransactionTable/TransactionRow/__snapshots__/TransactionRowMobile.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ exports[`TransactionRowMobile > should render 1`] = `
data-testid="TransactionRowAddressing__container"
>
<div
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1kocbuc"
color="secondary"
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1qplu6d"
color="danger-bg"
data-testid="TransactionRowAddressing__label"
>
Return
To
</div>
<div
class="w-50 sm:w-40 lg:w-50"
Expand Down Expand Up @@ -124,8 +124,8 @@ exports[`TransactionRowMobile > should render 1`] = `
class="text-sm font-semibold text-theme-secondary-900 dark:text-theme-secondary-200"
>
<div
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-1vn5kd9"
color="secondary"
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-xqt0aw"
color="danger-bg"
data-testid="AmountLabel__wrapper"
>
<div
Expand All @@ -135,7 +135,7 @@ exports[`TransactionRowMobile > should render 1`] = `
class="whitespace-nowrap text-sm"
data-testid="Amount"
>
121 DARK
- 121 DARK
</span>
</div>
</div>
Expand Down Expand Up @@ -239,11 +239,11 @@ exports[`TransactionRowMobile > should render 2`] = `
data-testid="TransactionRowAddressing__container"
>
<div
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1kocbuc"
color="secondary"
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1qplu6d"
color="danger-bg"
data-testid="TransactionRowAddressing__label"
>
Return
To
</div>
<div
class="w-50 sm:w-40 lg:w-50"
Expand Down Expand Up @@ -293,8 +293,8 @@ exports[`TransactionRowMobile > should render 2`] = `
class="text-sm font-semibold text-theme-secondary-900 dark:text-theme-secondary-200"
>
<div
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-1vn5kd9"
color="secondary"
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-xqt0aw"
color="danger-bg"
data-testid="AmountLabel__wrapper"
>
<div
Expand All @@ -304,7 +304,7 @@ exports[`TransactionRowMobile > should render 2`] = `
class="whitespace-nowrap text-sm"
data-testid="Amount"
>
121 DARK
- 121 DARK
</span>
</div>
</div>
Expand Down Expand Up @@ -700,11 +700,11 @@ exports[`TransactionRowMobile > should render with currency 1`] = `
data-testid="TransactionRowAddressing__container"
>
<div
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1kocbuc"
color="secondary"
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1qplu6d"
color="danger-bg"
data-testid="TransactionRowAddressing__label"
>
Return
To
</div>
<div
class="w-50 sm:w-30"
Expand Down Expand Up @@ -743,8 +743,8 @@ exports[`TransactionRowMobile > should render with currency 1`] = `
class="text-sm font-semibold text-theme-secondary-900 dark:text-theme-secondary-200"
>
<div
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-1vn5kd9"
color="secondary"
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-xqt0aw"
color="danger-bg"
data-testid="AmountLabel__wrapper"
>
<div
Expand All @@ -754,7 +754,7 @@ exports[`TransactionRowMobile > should render with currency 1`] = `
class="whitespace-nowrap text-sm"
data-testid="Amount"
>
121 BTC
- 121 BTC
</span>
</div>
</div>
Expand Down Expand Up @@ -858,11 +858,11 @@ exports[`TransactionRowMobile > should render with currency 2`] = `
data-testid="TransactionRowAddressing__container"
>
<div
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1kocbuc"
color="secondary"
class="!flex h-[21px] w-12 items-center justify-center rounded px-1 py-[3px] dark:border css-1qplu6d"
color="danger-bg"
data-testid="TransactionRowAddressing__label"
>
Return
To
</div>
<div
class="w-50 sm:w-30"
Expand Down Expand Up @@ -901,8 +901,8 @@ exports[`TransactionRowMobile > should render with currency 2`] = `
class="text-sm font-semibold text-theme-secondary-900 dark:text-theme-secondary-200"
>
<div
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-1vn5kd9"
color="secondary"
class="flex items-center justify-center px-1.5 h-[21px] rounded dark:border css-xqt0aw"
color="danger-bg"
data-testid="AmountLabel__wrapper"
>
<div
Expand All @@ -912,7 +912,7 @@ exports[`TransactionRowMobile > should render with currency 2`] = `
class="whitespace-nowrap text-sm"
data-testid="Amount"
>
121 BTC
- 121 BTC
</span>
</div>
</div>
Expand Down
Loading
Loading