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

Allow filtering out unconfirmed transactions #1861

Merged
merged 4 commits into from
Dec 12, 2023
Merged

Allow filtering out unconfirmed transactions #1861

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9fe7183
added unconfirmed filter
myxmaster Nov 19, 2023
9b7e623
use isConfirmed instead of num_confirmations to make filter work with…
myxmaster Nov 22, 2023
be0bcc2
Merge branch 'master' into add-unconfirmed-filter
kaloudis Dec 11, 2023
8f3d490
ActivityFilter: add condition for Unconfirmed
kaloudis Dec 12, 2023
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
2 changes: 1 addition & 1 deletion models/Transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export default class Transaction extends BaseModel {
return this.num_confirmations > 0 || this.status === 'confirmed';
}

@computed public get getAmount(): number | string {
@computed public get getAmount(): string {
const amount = this.value || this.amount || 0;
const fee = this.getFee;

Expand Down
3 changes: 3 additions & 0 deletions stores/ActivityStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export interface Filter {
received: boolean;
unpaid: boolean;
inTransit: boolean;
unconfirmed: boolean;
minimumAmount: number;
startDate?: Date;
endDate?: Date;
Expand All @@ -37,6 +38,7 @@ export const DEFAULT_FILTERS = {
received: true,
unpaid: true,
inTransit: false,
unconfirmed: true,
minimumAmount: 0,
startDate: undefined,
endDate: undefined
Expand Down Expand Up @@ -86,6 +88,7 @@ export default class ActivityStore {
received: true,
unpaid: false,
inTransit: false,
unconfirmed: true,
minimumAmount: 0,
startDate: undefined,
endDate: undefined
Expand Down
45 changes: 45 additions & 0 deletions utils/ActivityFilterUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,58 @@ describe('ActivityFilterUtils', () => {
]);
});

it('supports filtering unconfirmed transactions', () => {
const activities: any[] = [
new Transaction({
amount: 1,
time_stamp: (
new Date(2000, 1, 1, 3, 4, 5).getTime() / 1000
).toString(),
num_confirmations: 1
}),
new Transaction({
amount: 2,
time_stamp: (
new Date(2000, 1, 2, 3, 4, 4).getTime() / 1000
).toString(),
num_confirmations: 0
}),
new Invoice({
value: '3',
creation_date: (
new Date(2000, 1, 1, 3, 4, 5).getTime() / 1000
).toString()
}),
new Payment({
value: '4',
creation_date: (
new Date(2000, 1, 1, 3, 4, 5).getTime() / 1000
).toString()
})
];
const filter = getDefaultFilter();
filter.unconfirmed = false;

const filteredActivities = ActivityFilterUtils.filterActivities(
activities,
filter
);

expect(filteredActivities.map((a) => a.getAmount)).toEqual([
'1',
3,
'4'
]);
});

const getDefaultFilter = () =>
({
lightning: true,
onChain: true,
sent: true,
received: true,
unpaid: true,
unconfirmed: true,
minimumAmount: 0
} as Filter);
});
62 changes: 27 additions & 35 deletions utils/ActivityFilterUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import moment from 'moment';
import { Filter } from '../stores/ActivityStore';
import { localeString } from './LocaleUtils';
import Invoice from '../models/Invoice';
import Payment from '../models/Payment';
import Transaction from '../models/Transaction';
Expand All @@ -13,78 +12,71 @@ class ActivityFilterUtils {
let filteredActivity = activities;
if (filter.lightning == false) {
filteredActivity = filteredActivity.filter(
(activity: any) =>
(activity) =>
!(
activity.model ===
localeString('views.Invoice.title') ||
activity.model === localeString('views.Payment.title')
activity instanceof Invoice ||
activity instanceof Payment
)
);
}

if (filter.onChain == false) {
filteredActivity = filteredActivity.filter(
(activity: any) =>
(activity) =>
!(
activity.model ===
localeString('general.transaction') &&
activity.getAmount != 0
activity instanceof Transaction &&
Number(activity.getAmount) != 0
)
);
}

if (filter.sent == false) {
filteredActivity = filteredActivity.filter(
(activity: any) =>
(activity) =>
!(
(activity.model ===
localeString('general.transaction') &&
activity.getAmount < 0) ||
activity.model === localeString('views.Payment.title')
(activity instanceof Transaction &&
Number(activity.getAmount) < 0) ||
activity instanceof Payment
)
);
}

if (filter.received == false) {
filteredActivity = filteredActivity.filter(
(activity: any) =>
(activity) =>
!(
(activity.model ===
localeString('general.transaction') &&
activity.getAmount > 0) ||
(activity.model ===
localeString('views.Invoice.title') &&
activity.isPaid)
(activity instanceof Transaction &&
Number(activity.getAmount) > 0) ||
(activity instanceof Invoice && activity.isPaid)
)
);
}

if (filter.unpaid == false) {
filteredActivity = filteredActivity.filter(
(activity: any) =>
!(
activity.model ===
localeString('views.Invoice.title') &&
!activity.isPaid
)
(activity) => !(activity instanceof Invoice && !activity.isPaid)
);
}

if (filter.inTransit == false) {
filteredActivity = filteredActivity.filter(
(activity: any) =>
!(
activity.model ===
localeString('views.Payment.title') &&
activity.isInTransit
)
(activity) =>
!(activity instanceof Payment && activity.isInTransit)
);
}

if (filter.unconfirmed == false) {
filteredActivity = filteredActivity.filter(
(activity) =>
!(activity instanceof Transaction) ||
activity.num_confirmations > 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this won't work with other implementations

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be fixed now.

);
}

if (filter.minimumAmount > 0) {
filteredActivity = filteredActivity.filter(
(activity: any) =>
Math.abs(activity.getAmount) >= filter.minimumAmount
(activity) =>
Math.abs(Number(activity.getAmount)) >= filter.minimumAmount
);
}

Expand Down
7 changes: 7 additions & 0 deletions views/Activity/ActivityFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export default class ActivityFilter extends React.Component<
received,
unpaid,
inTransit,
unconfirmed,
minimumAmount,
startDate,
endDate
Expand Down Expand Up @@ -192,6 +193,12 @@ export default class ActivityFilter extends React.Component<
var: 'inTransit',
type: 'Toggle'
},
{
label: localeString('general.unconfirmed'),
value: unconfirmed,
var: 'unconfirmed',
type: 'Toggle'
},
{
label: localeString('views.ActivityFilter.minimumAmount'),
value: minimumAmount,
Expand Down