Feature: Integrate OpenPolicyEditCardLimitTypePage api command to the app #47092

waterim · 2024-08-08T16:14:02Z

Details

Integrate OpenPolicyEditCardLimitTypePage api command to the app

Fixed Issues

$ #46959
$ #45924
PROPOSAL: N/A

Tests

Pre-step:
Comment out the feature check in the WorkspaceExpensifyCardDetailsPage file, so you can access the screen.
Also don't forget to disable policy?.areExpensifyCardsEnabled here

Navigate to Workspace -> Members
Click on the member
Observe that cards displays correctly
Click on Card
Click on Limit type

Go through these steps from here:

Case 1: Monthly -> SmartLimit
Monthly-limit card with:
limit: $1000
currentSpend: $500
unapprovedSpend: $1100
totalSpend: $2000
If the admin updates the card to SmartLimit, we'll check if the unapprovedSpend >= limit - which in this case is true, so we'll show the warning: If you change this card's limit type to SmartLimit, new transactions will be declined because the $1,000 unapproved limit has already been reached.

Case 2: SmartLimit -> Monthly
SmartLimit card with:
limit: $1000
currentSpend: $1000
unapprovedSpend: $1000
totalSpend: $2000
If the admin updates the card to Monthly, unapprovedSpend >= limit is true so we'll show the warning: **If you change this card's limit type to monthly, new transactions will be declined because the $1,000 monthly limit has already been reached.**

Case 3: Monthly or SmartLimit -> Fixed
SmartLimit card with:
limit: $1000
currentSpend: $500
unapprovedSpend: $500
totalSpend: $2000
We'll check if totalSpend >= **limit - true, in this case so we won't show Fixed as an option

Case 4: Fixed -> SmartLimit
Fixed-limit card with:
limit: $1000
currentSpend: $500
unapprovedSpend: $500
totalSpend: $500
If the admin updates the card to SmartLimit, we'll check if unapprovedSpend >= limit - false, in this case so we won't show the warning

Case 5: Fixed -> Monthly
Fixed-limit card with:
limit: $1000
currentSpend: $500
unapprovedSpend: $500
totalSpend: $500
Updating the card to Monthly shouldn't cause any issues here since currentSpend is still within the limit so we won't show the warning

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

None

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

unapprovedSpend > limit and changing MONTHLY -> SMART

unapprovedSpend > limit and changing SMART -> MONTLY

totalSpend > limit

unapprovedSpend > limit and changing FIXED -> SMART

melvin-bot · 2024-08-08T16:21:10Z

@dubielzyk-expensify @DylanDylann One of you needs to 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]

dubielzyk-expensify · 2024-08-09T01:49:04Z

If this has visual changes, then it'd be great to get screenshots for desktop and mobile to review 😄

DylanDylann · 2024-08-09T06:48:37Z

@waterim Please ping me when the PR is ready

allgandalf · 2024-08-09T09:13:09Z

Taking this over from @DylanDylann , slack, Can you resolve merge conflicts and get this ready for review @waterim , thanks

…yEditCardLimitTypePage

allgandalf · 2024-08-12T11:12:52Z

@waterim , can you update videos on all platforms

allgandalf

Few comments, looks good in the first review

src/ONYXKEYS.ts

allgandalf · 2024-08-12T11:16:08Z

src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx

-            ? 'workspace.expensifyCard.changeCardMonthlyLimitTypeWarning'
-            : 'workspace.expensifyCard.changeCardSmartLimitTypeWarning';
+            ? 'workspace.expensifyCard.changeCardSmartLimitTypeWarning'
+            : 'workspace.expensifyCard.changeCardMonthlyLimitTypeWarning';


If we have initialLimitType as CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY then we should fallback to 'workspace.expensifyCard.changeCardMonthlyLimitTypeWarning' like before right? I don't understand this change @waterim

If we have initialLimitType as CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY then we need to have SmartLimit warning because we are changing Monthly -> SmartLimit and warning will be for smartLimit and vise versa

ahh that makes senes to me!

src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx

allgandalf · 2024-08-12T11:20:07Z

src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx

+        if (card.unapprovedSpend !== undefined && card.nameValuePairs?.limit) {
+            // Spends are coming as negative numbers from the backend and we need to make it positive for the correct expression.
+            const unapprovedSpend = Math.abs(card.unapprovedSpend);
+            const isUnapprovedSpendOverLimit = unapprovedSpend >= card.nameValuePairs.limit;


Suggested change

const isUnapprovedSpendOverLimit = unapprovedSpend >= card.nameValuePairs.limit;

const isUnapprovedSpendOverLimit = unapprovedSpend > card.nameValuePairs.limit;

Does it mention in the design doc that we should block spends exactly equal to the limit too ? if not then just drop the equals to case

Yes, from this conversation

I don't have access there, maybe you can copy paste the comments or we can reconfirm on slack, c.c. @mountiny @MariaHCD

The Slack thread where @MariaHCD wrote this uses >= but it makes sense to just be >. I would wait for Maria to confirm

I think we should check for >=

Let's say the current limit type of the card is Fixed and the admin wants to update the card to SmartLimit

If the unapprovedSpend is exactly equal to the limit, the card would no longer be usable if the card were updated to SmartLimit

Ah got it, thanks for the example

src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx

src/types/onyx/Card.ts

…icyEditCardLimitTypePage

waterim · 2024-08-12T12:29:14Z

@waterim , can you update videos on all platforms

I will upload screenshots for all cases, but this PR is not about adding new UI, do we really need to have videos from all platforms?

allgandalf · 2024-08-12T12:31:03Z

I will upload screenshots for all cases, but this PR is not about adding new UI, do we really need to have videos from all platforms?

Not really, I can do that for you, the author checklist states:

I included screenshots or videos for tests on all platforms

But in this case i can do that for you, no worries

waterim · 2024-08-12T12:36:48Z

@allgandalf Added all cases screenshots, also found one bug, will push in 1 min

waterim · 2024-08-12T12:38:23Z

@allgandalf should be ready!

allgandalf · 2024-08-12T15:19:28Z

@waterim what are the steps to get real data instead of the mock data? I am having trouble. I have connected bank account, but not able to add a virtual card and also get that card on the members details page

waterim · 2024-08-12T15:56:56Z

@waterim what are the steps to get real data instead of the mock data? I am having trouble. I have connected bank account, but not able to add a virtual card and also get that card on the members details page

if you have problems with createExpensifyCard maybe first checkout on the branch with ConfigureExpensifyCardsForPolicy #46564

This flow is not merged yet thats why you can't add new card without going on this PR

allgandalf · 2024-08-12T18:55:27Z

Can you merge main @waterim , the linked PR was merged to main

…icyEditCardLimitTypePage

waterim · 2024-08-12T19:04:01Z

@allgandalf merged

allgandalf · 2024-08-13T09:52:53Z

Still trying to setup the card, @waterim I tried checkout out to that branch but not much lucj

…icyEditCardLimitTypePage

allgandalf · 2024-08-13T13:18:54Z

Umm reassure test failed, maybe merge main again to trigger the workflow?

allgandalf · 2024-08-13T13:19:53Z

Also why is CLA failing

…icyEditCardLimitTypePage

allgandalf · 2024-08-14T04:19:47Z

@waterim , this has conflicts

…icyEditCardLimitTypePage

allgandalf · 2024-08-14T11:58:21Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

allgandalf

Looks good to be merged

mountiny

One minor comment

src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx

MariaHCD

LGTM! One small comment

MariaHCD · 2024-08-14T14:23:23Z

src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx

+            const validCombinations = [
+                [CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART],
+                [CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY],
+                [CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART],


We could also be updating a fixed limit card to monthly?

Case 5 from the testing steps above allows that

So Fixed -> Monthly should be included in validCombinations, correct?

According to the docs, Yes!

Cool, @waterim could you update this? :)

They are OoO until monday :)

Ah, okay, I've just pushed a commit to add this

OSBotify · 2024-08-14T20:09:10Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2024-08-15T18:19:06Z

🚀 Deployed to staging by https://github.com/MariaHCD in version: 9.0.21-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

mvtglobally · 2024-08-16T18:33:30Z

@mountiny @MariaHCD We not exactly sure how to QA all the cases described in this PR. Any chance you can validate these internally?

MariaHCD · 2024-08-19T14:40:16Z

Let's check this one off. We can test these internally (via full E2E tests) at a later stage.

OSBotify · 2024-08-19T16:00:10Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.0.21-4 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	failure ❌
🍎 iOS 🍎	success ✅
🕸 web 🕸	failure ❌

OSBotify · 2024-08-19T16:24:34Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.0.21-4 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

waterim added 4 commits August 8, 2024 17:52

update onyx card

497e3c4

remove comment

c8183fd

fix linter

ab8b4f2

add offlie blocker to card limit type

7882274

waterim marked this pull request as ready for review August 8, 2024 16:21

waterim requested a review from a team as a code owner August 8, 2024 16:21

melvin-bot bot requested review from dubielzyk-expensify and DylanDylann and removed request for a team August 8, 2024 16:21

mountiny assigned waterim Aug 8, 2024

mountiny requested review from MariaHCD and mountiny August 8, 2024 16:30

waterim added 2 commits August 8, 2024 18:46

remove unnecessary useMemo

e3e503c

remove useMemo from the import

eca5d5d

waterim added 4 commits August 9, 2024 12:05

remove permissions chang

abe1080

Merge remote-tracking branch upstream/main into feat-469590-OpenPolic…

c88d210

…yEditCardLimitTypePage

fix lint + react compiler

68b4ac5

remove output

ce7422e

allgandalf suggested changes Aug 12, 2024

View reviewed changes

waterim added 3 commits August 12, 2024 14:05

Merge remote-tracking branch 'upstream/main' into feat-469590-OpenPol…

7932553

…icyEditCardLimitTypePage

update onyx comment

18e344d

update submit function to be more readable

e927072

update tranlsation for FIXED

f0de767

Merge remote-tracking branch 'upstream/main' into feat-469590-OpenPol…

0881a50

…icyEditCardLimitTypePage

mountiny removed the request for review from DylanDylann August 13, 2024 10:51

Merge remote-tracking branch 'upstream/main' into feat-469590-OpenPol…

dc1897e

…icyEditCardLimitTypePage

Merge remote-tracking branch 'upstream/main' into feat-469590-OpenPol…

6aab7e4

…icyEditCardLimitTypePage

Merge remote-tracking branch 'upstream/main' into feat-469590-OpenPol…

2145f46

…icyEditCardLimitTypePage

allgandalf approved these changes Aug 14, 2024

View reviewed changes

mountiny previously approved these changes Aug 14, 2024

View reviewed changes

src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx Show resolved Hide resolved

MariaHCD reviewed Aug 14, 2024

View reviewed changes

Add Fixed -> Monthly to valid combinations

8819dd3

MariaHCD dismissed mountiny’s stale review via 8819dd3 August 14, 2024 19:06

MariaHCD approved these changes Aug 14, 2024

View reviewed changes

MariaHCD merged commit 6c4502a into Expensify:main Aug 14, 2024
17 checks passed

github-actions bot mentioned this pull request Aug 15, 2024

Deploy Checklist: New Expensify 2024-08-15 #47512

Closed

74 tasks

	const isUnapprovedSpendOverLimit = unapprovedSpend >= card.nameValuePairs.limit;
	const isUnapprovedSpendOverLimit = unapprovedSpend > card.nameValuePairs.limit;

Feature: Integrate OpenPolicyEditCardLimitTypePage api command to the app #47092

Feature: Integrate OpenPolicyEditCardLimitTypePage api command to the app #47092

Conversation

waterim commented Aug 8, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 8, 2024

dubielzyk-expensify commented Aug 9, 2024

DylanDylann commented Aug 9, 2024

allgandalf commented Aug 9, 2024

allgandalf commented Aug 12, 2024

allgandalf left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

waterim commented Aug 12, 2024

allgandalf commented Aug 12, 2024

waterim commented Aug 12, 2024

waterim commented Aug 12, 2024

allgandalf commented Aug 12, 2024

waterim commented Aug 12, 2024

allgandalf commented Aug 12, 2024

waterim commented Aug 12, 2024

allgandalf commented Aug 13, 2024

allgandalf commented Aug 13, 2024

allgandalf commented Aug 13, 2024 • edited Loading

allgandalf commented Aug 14, 2024

allgandalf commented Aug 14, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

allgandalf left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

MariaHCD left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OSBotify commented Aug 14, 2024

OSBotify commented Aug 15, 2024

mvtglobally commented Aug 16, 2024

MariaHCD commented Aug 19, 2024

OSBotify commented Aug 19, 2024

OSBotify commented Aug 19, 2024

waterim commented Aug 8, 2024 •

edited

Loading

allgandalf commented Aug 13, 2024 •

edited

Loading

allgandalf commented Aug 14, 2024 •

edited

Loading