-
Notifications
You must be signed in to change notification settings - Fork 3k
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
[NO-QA]: Add Card reconciliation account setting #44968
[NO-QA]: Add Card reconciliation account setting #44968
Conversation
@eVoloshchak Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
Conflicts resolved. This PR also includes changes from this issue #44314 |
I will take over this PR |
src/ROUTES.ts
Outdated
POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CARD_RECONCILIATION: { | ||
route: 'settings/workspaces/:policyID/accounting/quickbooks-online/card-reconciliation', | ||
getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/card-reconciliation` as const, | ||
}, | ||
POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT: { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe we have created the routes in this PR https://github.com/Expensify/App/pull/45047/files in more generic way cc @koko57 @VickyStash
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mountiny done!
@@ -300,7 +307,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting | |||
}, | |||
] | |||
: []), | |||
...(isEmptyObject(policy?.connections) || shouldShowSynchronizationError | |||
...(!isEmptyObject(policy?.connections) || shouldShowSynchronizationError |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@narefyev91 Why do we change this line?
@narefyev91 The Reconciliation Account Settings page is created in this PR #45047 . Please merge the latest main |
@narefyev91 The linked issue #44315 is creating Card Reconciliation page not Card reconciliation account setting. Card reconciliation account setting is created in another PR ![]() |
@DylanDylann - @narefyev91 is ooo, I'm taking over this PR |
yes, and this PR adds a correct page. There is some misunderstading with the routes - #45047 this PR should actually lead to /settings/workspaces/YOUR_POLICY_ID/accounting/CONNECTION/card-reconciliation/account not to /settings/workspaces/YOUR_POLICY_ID/accounting/CONNECTION/card-reconciliation. I need to add another route (/settings/workspaces/YOUR_POLICY_ID/accounting/CONNECTION/card-reconciliation/account) and change the pages |
already merged with these changes |
@mountiny @DylanDylann looks like this PR should be linked to #44314. The code here misses the switch and logic for this page. I just fixed the problem with routes. Maybe we can merge this one the way it is, I will take care of the Card Reconciliation Page in another PR, when I'm back (tomorrow, I'm ooo and I need to skedaddle now) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
wrapperStyle: [styles.sectionMenuItemTopDescription], | ||
onPress: integrationData?.onCardReconciliationPagePress, | ||
}, | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am working on this PR. Trying to complete the checklist today |
Reviewer Checklist
Screenshots/VideosAndroid: NativeScreen.Recording.2024-07-13.at.00.31.43.movAndroid: mWeb ChromeScreen.Recording.2024-07-13.at.00.29.38.moviOS: NativeScreen.Recording.2024-07-13.at.00.32.02.moviOS: mWeb SafariScreen.Recording.2024-07-13.at.00.28.57.movMacOS: Chrome / SafariScreen.Recording.2024-07-13.at.00.27.40.movMacOS: DesktopScreen.Recording.2024-07-13.at.00.30.52.mov |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.7-3 🚀
|
🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.0.7-4 🚀
@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes. |
🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.7-8 🚀
|
@mountiny @DylanDylann the UI is done in #45452 |
🚀 Deployed to production by https://github.com/mountiny in version: 9.0.8-6 🚀
|
Details
Add card reconciliation account setting
Fixed Issues
$ #44315
$ #44314
PROPOSAL:
Tests
Offline tests
QA Steps
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)myBool && <MyComponent />
.src/languages/*
files and using the translation methodSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Design
label and/or tagged@Expensify/design
so the design team can review the changes.ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop