Activity filter memo and maximum amount #2807

Mayank2808sharma · 2025-02-06T17:15:06Z

Description

Relates to issue: ZEUS-83

I added the functionality to filter the activity list using memo/note and maximum amount.

This pull request is categorized as a:

Checklist

[✅ ] I’ve run yarn run tsc and made sure my code compiles correctly
[✅] I’ve run yarn run lint and made sure my code didn’t contain any problematic patterns
[✅] I’ve run yarn run prettier and made sure my code is formatted correctly
[✅] I’ve run yarn run test and made sure all of the tests pass

Testing

If you modified or added a utility file, did you add new unit tests?

No, I’m a fool
[✅] Yes
N/A

I have tested this PR on the following platforms (please specify OS version and phone model/VM):

[✅] Android (version: Android 15)
iOS

I have tested this PR with the following types of nodes (please specify node version and API version where appropriate):

Locales

I’ve added new locale text that requires translations
[✅] I’m aware that new translations should be made on the ZEUS Transfix page and not directly to this repo

Third Party Dependencies and Packages

Contributors will need to run yarn after this PR is merged in
3rd party dependencies have been modified:
- verify that package.json and yarn.lock have been properly updated
- verify that dependencies are installed for both iOS and Android platforms

Other:

Changes were made that require an update to the README
Changes were made that require an update to onboarding

kaloudis · 2025-02-06T17:57:10Z

stores/ActivityStore.ts

-    endDate: undefined
+    endDate: undefined,
+    memo: '',
+    maximumAmount: Infinity


I think it might be better to just have Infinity/No limit/No maximum be a placeholder for the text input

I will change it such that the maximumAmount textbox will show no limits as a placeholder.
Gonna Remove the Infinity one

kaloudis · 2025-02-06T17:57:39Z

stores/ActivityStore.ts

@@ -33,6 +33,8 @@ export interface Filter {
    minimumAmount: number;
    startDate?: Date;
    endDate?: Date;
+    memo: string;
+    maximumAmount: number;


nit: would probably just slot maximumAmount right below minimumAmount

kaloudis · 2025-02-06T17:57:56Z

utils/ActivityFilterUtils.test.ts

+
+        expect(filteredActivities.length).toBe(1);
+        expect(filteredActivities[0].getNote).toBe('Payment for invoice');
+    });


Love to see the test cases here!

kaloudis · 2025-02-06T17:58:59Z

nit: the merge commit is OK, but would be better to you rebase the PR instead

kaloudis · 2025-02-06T18:00:05Z

nit: you can just put an x inbetween the [ ] brackets in PR description to check the boxes

myxmaster · 2025-02-06T22:28:05Z

Didn't test yet, but this looks pretty nice!

Can you please localize the placeholders as well?

myxmaster · 2025-02-08T10:52:30Z

The Minimum Amount (sats) placeholder is gone:

myxmaster · 2025-02-08T11:09:22Z

The Memo/Note filter only works for notes, not for memos.

Mayank2808sharma · 2025-02-08T11:29:13Z

The Minimum Amount (sats) placeholder is gone:

@myxmaster The Minimum Amount (sats) is 0 right? or should i make a placeholder similar to Maximum Amount sats for Minimum amount

Mayank2808sharma · 2025-02-08T11:33:23Z

The Memo/Note filter only works for notes, not for memos.

Where do I get all the data for memos and notes for testing purposes? As for now, I used lightning receive to create invoices to fill the activity list.
@myxmaster

myxmaster · 2025-02-08T15:04:34Z

The Minimum Amount (sats) is 0 right? or should i make a placeholder similar to Maximum Amount sats for Minimum amount

Currently (before this PR) we have "0" as placeholder in this input and we should keep it that way imo.

myxmaster · 2025-02-08T15:06:25Z

Where do I get all the data for memos and notes for testing purposes? As for now, I used lightning receive to create invoices to fill the activity list.

Yeah, you can just make invoices with memo... Notes are something else. (But I definitely like the idea to combine memo and notes for the filter.)

Mayank2808sharma · 2025-02-08T15:08:31Z

The Minimum Amount (sats) is 0 right? or should i make a placeholder similar to Maximum Amount sats for Minimum amount

Currently (before this PR) we have "0" as placeholder in this input and we should keep it that way imo.

alright so for minimum I will make it 0 and for maximum no limit

locales/en.json

myxmaster · 2025-02-09T10:51:52Z

Looking good!

Just one more thought:
I'm not sure if we should trim the memo filter input. It could be reasonable for users to filter two words, right?

myxmaster · 2025-02-09T10:53:32Z

utils/ActivityFilterUtils.ts

@@ -128,6 +136,24 @@ class ActivityFilterUtils {
                (activity) => activity.getDate.getTime() < endDate.getTime()
            );
        }
+        if ((filter.memo || '').trim() !== '') {


|| '' should be redundant since memo is initialized with '' ?

Initally I used filter.memo.trim() !== '' and a few test cases were failing so to tackle that I used (filter.memo || '').trim() !== ''

Yes, you need to add memo: '' to getDefaultFilter() in utils\ActivityFilterUtils.test.ts.

Mayank2808sharma · 2025-02-09T13:20:08Z

Looking good!

Just one more thought: I'm not sure if we should trim the memo filter input. It could be reasonable for users to filter two words, right?

Trimming helps prevent accidental spaces but still allows multi-word filtering like 'payment memo'. Let me know if you'd still prefer to remove it

myxmaster · 2025-02-10T17:56:23Z

Trimming helps prevent accidental spaces but still allows multi-word filtering like 'payment memo'.

Right now you can only paste two words, you cannot type it, because it will remove the space immediately.

Why do we even care if people filter (only space char)? If it was on accident and they don't understand that there is a space char in that filter input, they can always start fresh by using the delete icon. I'm not sure this user error prevention actually solves any problem.

myxmaster · 2025-02-10T18:44:22Z

LGTM now :)

shubhamkmr04

I have noticed the Activity view freezes after we set up the Memo/Note field.

shubhamkmr04 · 2025-02-11T11:29:26Z

frequently getting the warning

shubhamkmr04

Not able to type in anything in the memo/note field , recreated it in both emulator and physical android device

Screen.Recording.2025-02-11.at.5.05.39.PM.mov

myxmaster · 2025-02-11T14:00:34Z

Yes, I see the TypeError: Cannot read property 'toLowerCase' of undefined as well now. (I probably didn't see it before because filter.memo was already set during my testing.)

It happens because we are not merging the filters, which we get from Storage, with DEFAULT_FILTERS in getFilters(). That is needed when we open Activity view with a new Zeus version (where we implemented a new filter) for the first time (because at this point the new filter cannot exist in Storage). I think we should update the method to this:

    @action
    public async getFilters() {
        try {
            const filters = await Storage.getItem(ACTIVITY_FILTERS_KEY);
            if (filters) {
                const parsedFilters = JSON.parse(filters, (key, value) =>
                    (key === 'startDate' || key === 'endDate') && value
                        ? new Date(value)
                        : value
                );
                this.filters = { ...DEFAULT_FILTERS, ...parsedFilters };
            } else {
                console.log('No activity filters stored');
                this.filters = DEFAULT_FILTERS;
            }
        } catch (error) {
            console.log('Loading activity filters failed', error);
        }

        return this.filters;
    }

@shubhamkmr04:

Not able to type in anything in the memo/note field

This is something else and has nothing to do with this PR. I think it is some old workaround for the virtual keyboard covering some stuff.
Please test this:
Start current Zeus release (not on this feature branch here) on Android emulator or physical device, open Filter view, do NOT scroll down all the way, click on Minimum Amount (sats) input.
-> Keyboard will appear and immediately disappear and the view will scroll down.
-> Now, when it is scrolled down all the way, you can click on the input again and the keyboard will appear and stay.

Edit:
But ok, I notice that for you the keyboard doesn't even stay when you ARE scrolled down all the way... We should investigate further...

Mayank2808sharma · 2025-02-11T17:31:58Z

Hello @shubhamkmr04 and @myxmaster

I believe the issue TypeError: Cannot read property 'toLowerCase' of undefined can be resolved by using filter.memo?.toLowerCase() || '';

Regarding the other two issues, I’m not entirely sure why they’re occurring.

But if we put the memo filter textbox above the min and max, the keyboard opens up

Please let me know the next steps or should I put the memo box above

Mayank2808sharma · 2025-02-11T17:52:01Z

Screenrecording_20250211_231918.mp4

myxmaster · 2025-02-11T22:29:04Z

I believe the issue TypeError: Cannot read property 'toLowerCase' of undefined can be resolved by using filter.memo?.toLowerCase() || '';

Yes, it should fix it, but it masks the underlying issue of incomplete filter data. Imo the updated getFilters() method is the cleaner solution.

myxmaster · 2025-02-11T23:30:53Z

Regarding the keyboard appear/disappear issue:
Instead of moving the input up, I think we should replace <FlatList> with <ScrollView>. That fixes the issue on Android at least, no idea about iOS.

Only minor code changes needed:

                <ScrollView>
                    {FILTERS.map((item, index) => {
                        if (!item.condition) return null;

                        return (
                            <React.Fragment key={index}>
                                <ListItem
                                    containerStyle={{
                                        borderBottomWidth: 0,
                                        backgroundColor: 'transparent'
                                    }}
                                >
                                    [...]
                                </ListItem>
                                {index < FILTERS.length - 1 &&
                                    this.renderSeparator()}
                            </React.Fragment>
                        );
                    })}
                </ScrollView>

Mayank2808sharma · 2025-02-12T13:28:46Z

@myxmaster

so should I make changes according to your suggestion?

myxmaster · 2025-02-13T09:24:58Z

Merging the filters with DEFAULT_FILTERS in getFilters()
-> for sure

Replacing FlatList with ScrollView
-> Well, I don't see any disadvantages in using ScrollView instead of FlatList, and the Keyboard appearance issues are completely gone for me when using ScrollView. Thoughts @shubhamkmr04 @kaloudis ?

kaloudis · 2025-02-13T12:10:25Z

Merging the filters with DEFAULT_FILTERS in getFilters() -> for sure

Replacing FlatList with ScrollView -> Well, I don't see any disadvantages in using ScrollView instead of FlatList, and the Keyboard appearance issues are completely gone for me when using ScrollView. Thoughts @shubhamkmr04 @kaloudis ?

We should try it out. I think it will work without issue.

…mAmount

myxmaster · 2025-02-14T10:21:44Z

Tested -> no issues now when coming from Zeus version without the new filter.

ScrollView also working perfectly fine, no keyboard issues for me (tested with Android emulator only).

shubhamkmr04 · 2025-02-14T15:30:48Z

@Mayank2808sharma so for iOS we still this small issue when we can't see the fields that are in the bottom of the view because keyboard won't go away

Simulator.Screen.Recording.-.iPhone.16.Pro.-.2025-02-14.at.20.57.07.mp4

It should be a small fix, you can take reference from here

Mayank2808sharma · 2025-02-14T18:06:33Z

@Mayank2808sharma so for iOS we still this small issue when we can't see the fields that are in the bottom of the view because keyboard won't go away

Simulator.Screen.Recording.-.iPhone.16.Pro.-.2025-02-14.at.20.57.07.mp4
It should be a small fix, you can take reference from here

Thanks for the resource. I have made the changes, let me know what you think

kaloudis reviewed Feb 6, 2025

View reviewed changes

kaloudis added the Activity Activity view label Feb 6, 2025

kaloudis added this to the v0.10.0 milestone Feb 6, 2025

Mayank2808sharma force-pushed the activity-filter branch from 89a0557 to edca2fd Compare February 6, 2025 19:01

Mayank2808sharma force-pushed the activity-filter branch from edca2fd to 1510996 Compare February 7, 2025 06:36

Mayank2808sharma force-pushed the activity-filter branch from 1510996 to 85f16db Compare February 8, 2025 17:20

myxmaster reviewed Feb 8, 2025

View reviewed changes

locales/en.json Outdated Show resolved Hide resolved

myxmaster reviewed Feb 9, 2025

View reviewed changes

Mayank2808sharma force-pushed the activity-filter branch from fd7f732 to 549de9b Compare February 10, 2025 18:31

shubhamkmr04 reviewed Feb 11, 2025

View reviewed changes

kaloudis and others added 12 commits February 14, 2025 00:34

memo & note based filter

08004c4

adding maximum amount filter

bf58cee

adding testcases for memo and maximum amount filter

2f38dfd

making the maximum Amount to no limits and maximumAmount under minimu…

49eaffe

…mAmount

adding placeholder to locales

d04feaf

fixed filter with memo and note

87b46f7

fixing minimumAmount placeholder issue

8bbedaf

minimumAmount placeholder back to original

fe6986f

removing redundancy from filter memo

f221076

removing the trim function from memo

245e170

converting from flatlist to scrollview

42fc34c

memo & note based filter

7d7bfa5

Mayank2808sharma force-pushed the activity-filter branch from 549de9b to 7d7bfa5 Compare February 13, 2025 19:15

adding keyboardAvoidingView

1d32f58

Activity filter memo and maximum amount #2807

Are you sure you want to change the base?

Activity filter memo and maximum amount #2807

Conversation

Mayank2808sharma commented Feb 6, 2025

Description

Checklist

Testing

Locales

Third Party Dependencies and Packages

Other:

kaloudis Feb 6, 2025

Choose a reason for hiding this comment

Mayank2808sharma Feb 6, 2025

Choose a reason for hiding this comment

kaloudis Feb 6, 2025

Choose a reason for hiding this comment

kaloudis Feb 6, 2025

Choose a reason for hiding this comment

kaloudis commented Feb 6, 2025

kaloudis commented Feb 6, 2025

myxmaster commented Feb 6, 2025

myxmaster commented Feb 8, 2025

myxmaster commented Feb 8, 2025

Mayank2808sharma commented Feb 8, 2025 • edited Loading

Mayank2808sharma commented Feb 8, 2025

myxmaster commented Feb 8, 2025

myxmaster commented Feb 8, 2025

Mayank2808sharma commented Feb 8, 2025

myxmaster commented Feb 9, 2025

myxmaster Feb 9, 2025

Choose a reason for hiding this comment

Mayank2808sharma Feb 9, 2025

Choose a reason for hiding this comment

myxmaster Feb 10, 2025

Choose a reason for hiding this comment

Mayank2808sharma commented Feb 9, 2025

myxmaster commented Feb 10, 2025 • edited Loading

myxmaster commented Feb 10, 2025

shubhamkmr04 left a comment

Choose a reason for hiding this comment

shubhamkmr04 commented Feb 11, 2025

shubhamkmr04 left a comment

Choose a reason for hiding this comment

myxmaster commented Feb 11, 2025 • edited Loading

Mayank2808sharma commented Feb 11, 2025

Mayank2808sharma commented Feb 11, 2025

myxmaster commented Feb 11, 2025

myxmaster commented Feb 11, 2025

Mayank2808sharma commented Feb 12, 2025

myxmaster commented Feb 13, 2025

kaloudis commented Feb 13, 2025

myxmaster commented Feb 14, 2025

shubhamkmr04 commented Feb 14, 2025

Mayank2808sharma commented Feb 14, 2025

Mayank2808sharma commented Feb 8, 2025 •

edited

Loading

myxmaster commented Feb 10, 2025 •

edited

Loading

myxmaster commented Feb 11, 2025 •

edited

Loading