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.

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

[Mobile] Fix #3214 - Pull down to refresh triggering clicks on budget cells #3374

Merged
merged 16 commits into from
Sep 18, 2024

Conversation

joel-jeremy
Copy link
Contributor

@joel-jeremy joel-jeremy commented Sep 5, 2024

Resolves #3214

The CellValue component has been refactored to be more composable. To fix the cell value components in the mobile budget table, I had to update them to use the new react aria Button - this looks to have fixed the issue.

Not sure what are causing some of VRT screenshots to change but it looks like the color changed on them.

@actual-github-bot actual-github-bot bot changed the title Fix #3214 [WIP] Fix #3214 Sep 5, 2024
Copy link

netlify bot commented Sep 5, 2024

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit c7d9072
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/66da1c570d8aab0008edc206
😎 Deploy Preview https://deploy-preview-3374.demo.actualbudget.org
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link

netlify bot commented Sep 5, 2024

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit 3b2e59b
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/66e4c32e1a6679000842378f
😎 Deploy Preview https://deploy-preview-3374.demo.actualbudget.org
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor

github-actions bot commented Sep 5, 2024

Bundle Stats — desktop-client

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
9 5.16 MB → 5.17 MB (+2.7 kB) +0.05%
Changeset
File Δ Size
src/components/budget/BalanceWithCarryover.tsx 📈 +675 B (+12.26%) 5.38 kB → 6.04 kB
src/components/budget/report/budgetsummary/BudgetTotal.tsx 📈 +153 B (+9.30%) 1.61 kB → 1.76 kB
src/components/budget/rollover/budgetsummary/TotalsList.tsx 📈 +341 B (+8.91%) 3.74 kB → 4.07 kB
src/components/spreadsheet/CellValue.tsx 📈 +67 B (+8.36%) 801 B → 868 B
src/components/modals/ReportBalanceMenuModal.tsx 📈 +173 B (+7.34%) 2.3 kB → 2.47 kB
src/components/modals/RolloverBalanceMenuModal.tsx 📈 +173 B (+7.10%) 2.38 kB → 2.55 kB
src/components/mobile/transactions/TransactionListWithBalances.jsx 📈 +361 B (+6.74%) 5.23 kB → 5.59 kB
src/components/mobile/accounts/Accounts.jsx 📈 +258 B (+3.52%) 7.15 kB → 7.4 kB
src/components/accounts/Balance.jsx 📈 +163 B (+2.94%) 5.41 kB → 5.57 kB
src/components/budget/rollover/RolloverComponents.tsx 📈 +263 B (+1.87%) 13.76 kB → 14.02 kB
src/components/budget/report/ReportComponents.tsx 📈 +56 B (+0.42%) 12.9 kB → 12.96 kB
src/components/mobile/budget/BudgetTable.jsx 📈 +82 B (+0.15%) 52.14 kB → 52.22 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
static/js/index.js 3.19 MB → 3.2 MB (+2.21 kB) +0.07%
static/js/narrow.js 78.89 kB → 79.23 kB (+340 B) +0.42%
static/js/wide.js 224.99 kB → 225.14 kB (+163 B) +0.07%

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
static/js/usePreviewTransactions.js 1.59 kB 0%
static/js/resize-observer.js 18.37 kB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 13.5 kB 0%
static/js/AppliedFilters.js 20.97 kB 0%
static/js/BackgroundImage.js 122.29 kB 0%
static/js/ReportRouter.js 1.5 MB 0%

Copy link
Contributor

github-actions bot commented Sep 5, 2024

Bundle Stats — loot-core

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
1 1.19 MB 0%

Changeset

No files were changed

View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

No assets were bigger

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
kcab.worker.js 1.19 MB 0%

@@ -53,7 +53,7 @@ export function usePreviewTransactions(
})),
}));
setPreviewTransactions(ungroupTransactions(withDefaults));
collapseTransactions(withDefaults.map(t => t.id));
collapseTransactions?.(withDefaults.map(t => t.id));
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is resulting in an error in console.log. Fixing it here.

@joel-jeremy joel-jeremy changed the title [WIP] Fix #3214 Fix #3214 Sep 5, 2024
@joel-jeremy joel-jeremy changed the title Fix #3214 [Mobile] Fix #3214 - Pull down to refresh triggering clicks on budget cells Sep 5, 2024
Copy link
Member

Choose a reason for hiding this comment

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

The sign on the budgeted value in the table disappeared

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 :)

Copy link
Member

Choose a reason for hiding this comment

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

The budgeted value shifted slightly but thats not a huge deal I would think.

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 :)

Copy link
Member

Choose a reason for hiding this comment

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

Still seeing the same thing. I guess it would be more accurate to say that the budgeted total gained a sign where it should be a positive listing where the header now shows negative.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Weird. It's fixed when you access the link but it still shows in the VRT screenshot. There seem to be something weird with the VRT tests it's not detecting the changes made I had to delete the screenshots and rerun the VRT.

Copy link
Contributor

Choose a reason for hiding this comment

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

This one doesn't look quite right

@tim-smart
Copy link
Contributor

Not sure if intentional, but this changes the colour of zero values on the mobile budget table.

@joel-jeremy
Copy link
Contributor Author

Fixed the VRT. I had to checkout the entire e2e/ folder from master and rerun the VRT again.

@joel-jeremy
Copy link
Contributor Author

joel-jeremy commented Sep 8, 2024

Not sure if intentional, but this changes the colour of zero values on the mobile budget table.

I think the zero values in edge is broken. All zeroes used to be grayed out before, similar to how it is in desktop.

@tim-smart
Copy link
Contributor

I think the zero values in edge is broken. All zeroes used to be grayed out before, similar to how it is in desktop.

Ah right. I think we might need to bump the contrast on the gray in another PR, it is quite hard to see the text - even if it is demoted in importance.

@joel-jeremy
Copy link
Contributor Author

@MatissJanis Would you mind reviewing on top of @matt-fidd's approval?

@MatissJanis
Copy link
Member

👋 I'm not sure I follow the refactored logic here. Am I missing something?

The issue appeared when we moved from the old Button to Button2. So surely we'll have the same issue in other parts of the app too that use drag-to-refresh functionality, no? Such as: account list, single account page.

This makes me think that the patch should be in Button2 and not specifically isolated to the budget component tree.

But again: probably I'm missing something.

@joel-jeremy
Copy link
Contributor Author

👋 I'm not sure I follow the refactored logic here. Am I missing something?

The issue appeared when we moved from the old Button to Button2. So surely we'll have the same issue in other parts of the app too that use drag-to-refresh functionality, no? Such as: account list, single account page.

This makes me think that the patch should be in Button2 and not specifically isolated to the budget component tree.

But again: probably I'm missing something.

The issue happens because the CellValue wraps the Button2 components (budget cell and balance cell) with a Text component. The click handler is attached to the Text component instead of the underlying Button2 component which causes the quirky behavior we see here. So the refactor is to allow us to render the cell value as Button2 (without being wrapped by a Text component) and allows us to attach the click handler on the button which handles it in a more standard way.

It doesn't happen in the other parts of the app because the Button2 in those parts are not wrapped with another component.

@joel-jeremy joel-jeremy merged commit 6f41b20 into master Sep 18, 2024
19 checks passed
@joel-jeremy joel-jeremy deleted the fix-3214 branch September 18, 2024 13:28
Copy link
Contributor

coderabbitai bot commented Sep 18, 2024

Caution

Review failed

The pull request is closed.

Walkthrough

The pull request introduces significant architectural changes across multiple components in the desktop and mobile applications. It primarily focuses on enhancing the rendering of financial values by implementing a render prop pattern and introducing a new CellValueText component. This restructuring improves flexibility, maintainability, and privacy in displaying financial data while addressing a specific bug related to the mobile budget table's refresh functionality.

Changes

File Change Summary
packages/desktop-client/src/components/accounts/Balance.jsx Refactored CellValue to use a render prop pattern, added CellValueText for display logic.
packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx Renamed DefaultCarryoverIndicator to CarryoverIndicator, updated props for flexibility.
packages/desktop-client/src/components/budget/report/ReportComponents.tsx Updated ReportCellValue to use CellValueText, enhancing modularity and type safety.
packages/desktop-client/src/components/budget/report/budgetsummary/BudgetTotal.tsx Integrated CellValueText for rendering balance values, refining display logic.
packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx Refactored RolloverCellValue to utilize a render prop pattern for better styling control.
packages/desktop-client/src/components/mobile/accounts/Accounts.jsx Updated CellValue to use a render prop pattern for flexible financial value styling.
packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx Introduced PrivacyFilter for sensitive data, refactored financial value rendering.
packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx Replaced DefaultCarryoverIndicator with CarryoverIndicator, added CellValueText for balance.
packages/desktop-client/src/components/spreadsheet/CellValue.tsx Restructured CellValue and CellValueText for improved type safety and rendering flexibility.
upcoming-release-notes/3374.md Documented a bug fix for mobile budget table refresh behavior.

Assessment against linked issues

Objective Addressed Explanation
Prevent tap on budget row when pulling to refresh (issue #3214)

Possibly related PRs

Suggested reviewers

  • MatissJanis
  • joel-jeremy
  • matt-fidd
  • Tim-smart

Poem

🐰 In the meadow where values play,
A render prop leads the way.
With CellValueText shining bright,
Financial data feels just right.
Privacy wrapped in a gentle hug,
Bugs are fixed, let’s all give a shrug! 🌼


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    -- I pushed a fix in commit <commit_id>, please review it.
    -- Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    -- @coderabbitai generate unit testing code for this file.
    -- @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    -- @coderabbitai generate interesting stats about this repository and render them as a table.
    -- @coderabbitai read src/utils.ts and generate unit testing code.
    -- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    -- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@MatissJanis MatissJanis mentioned this pull request Sep 19, 2024
2 tasks
a-gradina pushed a commit to a-gradina/actual that referenced this pull request Sep 24, 2024
…ks on budget cells (actualbudget#3374)

* Fix actualbudget#3214

* Fix rollover indicator

* VRT

* Fix typecheck error

* VRT

* Release notes

* VRT

* Update style

* Fix budgeted

* VRT

* VRT

* Revert VRT

* VRT

* Fix style

* Revert usePreviewTransactions

* Fix error
@coderabbitai coderabbitai bot mentioned this pull request Oct 3, 2024
matt-fidd added a commit that referenced this pull request Oct 3, 2024
* marked files for translation

* added release note

* fixed linting warnings

* 🐛 fix account filters being overridden (#3441)

* :electron: Reduce package size  (#3443)

* reduce package size of all packages

* release notes

* Update beforePackHook.ts

* [Maintenance] Cleanup react aria packages and dedupe (#3450)

* Cleanup react aria packages and dedupe

* Release notes

* ♻️ (synced-prefs) moving the prefs from metadata.json to the db (#3423)

* :electron: Restart server silently when adding self signed cert and add some logs (#3431)

* restart server silently on add self signed cert and add some logging

* release notes

* fix name

* updating names to be more specific

* removing setloading

* feedback

* ♻️ (synced-prefs) move budget type to synced prefs (#3427)

* update synced account balance in db if available (#3452)

* 🐛 (synced-prefs) fix bulk-reading not working in import modal (#3460)

* fix: csv import deduplication (#3456)

* ✨ release simplefin as a first-party feature (#3459)

Closes #2272

* Do not allow renaming to an empty category or group name (#3463)

* Do not allow renaming to an emoty category or group name

* Release notes

* [Mobile] Fix #3214 - Pull down to refresh triggering clicks on budget cells (#3374)

* Fix #3214

* Fix rollover indicator

* VRT

* Fix typecheck error

* VRT

* Release notes

* VRT

* Update style

* Fix budgeted

* VRT

* VRT

* Revert VRT

* VRT

* Fix style

* Revert usePreviewTransactions

* Fix error

* Fix reports form submit handlers (#3462)

* Fix form submit handlers

* Release notes

* :electron: Remove some old updater code (#3468)

* remove some old updater code

* remove old updater logic

* CSV import e2e tests (#3467)

* Fix React Aria Button hover styles  (#3453)

* Fiox hover styles and use className instead of inline to prepare for future css migration

* Release notes

* Cleanup

* Update edit rule hover style

* Undoable auto transfer notes + auto notes for cover (#3411)

* Undo auto transfer notes + auto notes for cover

* Release notes

* Fix notes

* Fix notes undo

* Do not show clicked category on transfer or cover menus

* Fix typecheck error

* typecheck

* Fix removeCategoriesFromGroups

* 🐛 (reports) deleting custom report should remove it from the dashboard (#3469)

* Revert "CSV import e2e tests (#3467)" (#3474)

This reverts commit 5e12d40.

* ♻️ (synced-prefs) separate metadata and local prefs out (#3458)

* :electron: Replace deprecated file protocol registration (#3475)

* replace deprecated file handler in electron

* release notes

* types eh

* types

* update sql regexp to default to empty string when field is null (#3480)

* ♻️ rename report/rollover budget to tracking/envelope (#3483)

* 🐛 (import) fix csv import checkboxes not working (#3478)

* Update tooltip and themes with better visibility (#3298)

* Update tooltip and themes with better visibility

* Rename merge request # into release notes

* rename release note

* update VRT

* tweak light theme

* dont put border on autocomplete menus

* update VRT

* tweak popover style

* simplify

* update VRT

* update VRT

---------

Co-authored-by: Dustin Conlon <[email protected]>
Co-authored-by: Dustin Conlon <[email protected]>
Co-authored-by: youngcw <[email protected]>

* fix modals on mobile BudgetTable (#3487)

* Fix privacy filter (#3472)

* Fix privacy filter

* Release notes

* Coderabbit suggestion

* VRT

* VRT

* Revert VRT

* VRT

* VRT

* VRT

* VRT

* Delete VRT

* VRT

* Revert VRT

* 🐛 fix custom reports crashing when opening table (#3484)

* 🧪 (tests) adding custom report e2e tests (#3493)

* ✨ (dashboards) ability to save filters & timeframes on spending widgets (#3432)

* marked files for translation

* Revert ":bug: fix account filters being overridden (#3441)"

This reverts commit 7336bad.

* Revert "Revert ":bug: fix account filters being overridden (#3441)""

This reverts commit 5cbadc4.

* Revert changes due to failed rebase

* removed import of t

* fixed lint warning

* added PayeeTableRow.tsx

* needed changes

* bugfix: pluralization

* variables adjustments

* removed doubled trans

---------

Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Michael Clark <[email protected]>
Co-authored-by: Joel Jeremy Marquez <[email protected]>
Co-authored-by: Matt Fiddaman <[email protected]>
Co-authored-by: Koen van Staveren <[email protected]>
Co-authored-by: Ryan Bianchi <[email protected]>
Co-authored-by: Robert Dyer <[email protected]>
Co-authored-by: Dustin Conlon <[email protected]>
Co-authored-by: Dustin Conlon <[email protected]>
Co-authored-by: youngcw <[email protected]>
Co-authored-by: Tim <[email protected]>
@coderabbitai coderabbitai bot mentioned this pull request Oct 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Pull to refresh on mobile does not prevent tap on budget row
5 participants