Allow editing card transactions (not amount) #31353

grgia · 2023-11-15T10:42:29Z

Details

Fixed Issues

$ #28836

Tests

Verify that no errors appear in the JS console
Internal Test Steps
I created a test account with an expensify card following this SO
I added ECard transactions via clitools following this SO
I navigated to the report with the transactions in oldDot and copied the reportID from the URL
I opened https://dev.new.expensify.com:8083/r/<reportID>
I clicked on an Expensify Card transaction
I verified amount and card rows are NOT editable ❌
I verified that merchant, date, and description ARE editable ✅
I edited each field, opened OldDot Dev and navigated to the transaction and verified that the fields were modified ✅

Offline tests

QA Steps

Verify that no errors appear in the JS console
Verify that no errors appear in the JS console

Internal Test Steps

Log into an expensifail account with an Expensify Card provisioned
Create an expensify card transaction for the account
In OldDot, navigate to the report that the transaction is created on, note the reportID in the URL.
In NewDot, navigate to /r/ from the previous step. Click on the transaction to get to the Money Request View.
verify amount and card rows are NOT editable ❌
verify that merchant, date, and description ARE editable ✅
edit each field, verify that they are saved successfully. ✅
Opened OldDot Dev and navigated to the transaction to verify that the fields were modified in the DB ✅

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2023-11-17T14:19:18Z

@akinwale 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]

dylanexpensify · 2023-11-17T15:46:49Z

@akinwale let's prioritize this review today please! 🙇‍♂️

akinwale · 2023-11-17T16:04:19Z

@dylanexpensify Will do.

@grgia Can my account be enabled for the test steps? Or is there a test account I can use to verify? Thanks.

akinwale · 2023-11-17T17:45:06Z

src/libs/TransactionUtils.ts

+    if (!transaction.cardID) {
+        return false;
+    }
+    return transaction.cardID > 0;


This method be simplified to just return transaction.cardID > 0, or if it's possible for transaction to be null or undefined, return transaction?.cardID > 0.

Even though this is correct, I end up with this TS problem because cardID can be undefined

I can do this instead to get around TS problems, but I feel like it's also fine as is

@grgia Thanks. I think I prefer the second option, and you could also make it a one-liner: return (transaction?.cardID ?? 0) > 0 (no strong preference here).

I still haven't been able to test the functionality in the app as stated here: #31353 (comment). Any ideas on how I can test this?

luacmartins

Agree with @akinwale's comment

luacmartins · 2023-11-19T22:22:47Z

src/libs/TransactionUtils.ts

+    if (!transaction.cardID) {
+        return false;
+    }
+    return transaction.cardID > 0;


grgia · 2023-11-22T10:31:33Z

@akinwale @luacmartins could you take a look at the convo, I left some comments

grgia · 2023-11-22T14:57:09Z

pushed update

luacmartins

LGTM!

dylanexpensify · 2023-11-24T19:33:25Z

@akinwale can you review this as soon as?? Thank you!!

akinwale · 2023-11-24T19:45:22Z

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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(themeColors.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 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

akinwale

Code LGTM.

I don't have an account with Expensify cards to test with, so moving this forward.

melvin-bot · 2023-11-24T19:47:03Z

@srikarparsi 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]

OSBotify · 2023-11-24T20:09:14Z

✋ 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 · 2023-11-27T19:23:01Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.4-0 🚀

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

kavimuru · 2023-11-27T19:26:54Z

@grgia Should we run the "Internal Test Steps" provided in QA steps ?

kavimuru · 2023-11-28T20:21:24Z

@grgia @AndrewGable could you confirm if this PR will be validated internally? There are "Internal Test Steps" provided in QA steps.

luacmartins · 2023-11-28T20:49:10Z

@kavimuru I think you can test that PR. The OP just seems to have some formatting issues. Here are the steps:

Pre-requisite: an account with the expensify card and transactions on that card

In OldDot, login into the account
Navigate to the report that contains the Expensify card transactions
Copy the reportID shown in the URL
In NewDot, navigate to /r/<reportID> where reportID is the reportID copied in step 3
Click on the card transaction preview
Verify that the amount and card rows are NOT editable ❌
Verified that the merchant, date, and description ARE editable ✅
Edit each field and verify that it works

kavimuru · 2023-11-28T21:22:37Z

@luacmartins, thanks we will test and update.

mvtglobally · 2023-11-29T01:12:29Z

@luacmartins for step 5 transaction preview, what do we need to select? https://github.com/Expensify/App/assets/43995119/e6d8c83a-dce9-4d28-bc24-2951e2aa348c

OSBotify · 2023-11-29T11:45:37Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.4-3 🚀

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

Allow editing Expensify card transactions (not amount)

a07dc28

grgia self-assigned this Nov 15, 2023

Remove right icon from Amount row

e87465a

grgia changed the title ~~[HOLD Expensify/Auth 9183] Allow editing Expensify card transactions (not amount)~~ Allow editing Expensify card transactions (not amount) Nov 17, 2023

allow editing for all card transactions

7461fc0

grgia changed the title ~~Allow editing Expensify card transactions (not amount)~~ Allow editing card transactions (not amount) Nov 17, 2023

grgia marked this pull request as ready for review November 17, 2023 14:19

grgia requested a review from a team as a code owner November 17, 2023 14:19

melvin-bot bot requested review from akinwale and removed request for a team November 17, 2023 14:19

akinwale suggested changes Nov 17, 2023

View reviewed changes

luacmartins reviewed Nov 19, 2023

View reviewed changes

src/libs/TransactionUtils.ts Outdated

if (!transaction.cardID) {

return false;

}

return transaction.cardID > 0;

Copy link

Contributor

luacmartins Nov 19, 2023

Choose a reason for hiding this comment

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

+1

Christinadobrzyn mentioned this pull request Nov 20, 2023

[HOLD for payment 2023-12-06] [ECARD] CRITICAL: Transactions - Enable MoneyRequestView Edit Transactions Logic #28836

Closed

Merge branch 'main' into georgia-editCardTransactions

12eb47f

grgia requested review from luacmartins and akinwale November 22, 2023 10:31

syntax update

9b11ea3

luacmartins approved these changes Nov 22, 2023

View reviewed changes

akinwale approved these changes Nov 24, 2023

View reviewed changes

melvin-bot bot requested a review from srikarparsi November 24, 2023 19:47

luacmartins merged commit 792376e into main Nov 24, 2023
15 of 16 checks passed

luacmartins deleted the georgia-editCardTransactions branch November 24, 2023 20:04

github-actions bot mentioned this pull request Nov 27, 2023

Deploy Checklist: New Expensify 2023-11-27 #32066

Closed

53 tasks

marcaaron mentioned this pull request Nov 28, 2023

[HOLD for payment 2023-12-07] [HOLD for payment 2023-12-06] IOU - Clicking on card and amount does not cause any action #32077

Closed

6 tasks

kavimuru mentioned this pull request Nov 28, 2023

[$500] Web - Hmm... it's not here page displayed after clicking on the card transaction preview #32155

Closed

6 tasks

kbecciv mentioned this pull request Nov 29, 2023

[$500] Web - Unable to save a new date receipt, and a console error appears for pending report status #32201

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow editing card transactions (not amount) #31353

Allow editing card transactions (not amount) #31353

grgia commented Nov 15, 2023 •

edited

Loading

melvin-bot bot commented Nov 17, 2023

dylanexpensify commented Nov 17, 2023

akinwale commented Nov 17, 2023

akinwale Nov 17, 2023 •

edited

Loading

luacmartins Nov 19, 2023

grgia Nov 21, 2023

grgia Nov 21, 2023

grgia Nov 21, 2023

akinwale Nov 22, 2023

luacmartins left a comment

luacmartins Nov 19, 2023

grgia commented Nov 22, 2023

grgia commented Nov 22, 2023

luacmartins left a comment

dylanexpensify commented Nov 24, 2023

akinwale commented Nov 24, 2023

akinwale left a comment

melvin-bot bot commented Nov 24, 2023

OSBotify commented Nov 24, 2023

OSBotify commented Nov 27, 2023

kavimuru commented Nov 27, 2023

kavimuru commented Nov 28, 2023

luacmartins commented Nov 28, 2023

kavimuru commented Nov 28, 2023

mvtglobally commented Nov 29, 2023

OSBotify commented Nov 29, 2023

Allow editing card transactions (not amount) #31353

Allow editing card transactions (not amount) #31353

Conversation

grgia commented Nov 15, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 17, 2023

dylanexpensify commented Nov 17, 2023

akinwale commented Nov 17, 2023

akinwale Nov 17, 2023 • edited Loading

Choose a reason for hiding this comment

luacmartins Nov 19, 2023

Choose a reason for hiding this comment

grgia Nov 21, 2023

Choose a reason for hiding this comment

grgia Nov 21, 2023

Choose a reason for hiding this comment

grgia Nov 21, 2023

Choose a reason for hiding this comment

akinwale Nov 22, 2023

Choose a reason for hiding this comment

luacmartins left a comment

Choose a reason for hiding this comment

luacmartins Nov 19, 2023

Choose a reason for hiding this comment

grgia commented Nov 22, 2023

grgia commented Nov 22, 2023

luacmartins left a comment

Choose a reason for hiding this comment

dylanexpensify commented Nov 24, 2023

akinwale commented Nov 24, 2023

Reviewer Checklist

Screenshots/Videos

akinwale left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Nov 24, 2023

OSBotify commented Nov 24, 2023

OSBotify commented Nov 27, 2023

kavimuru commented Nov 27, 2023

kavimuru commented Nov 28, 2023

luacmartins commented Nov 28, 2023

kavimuru commented Nov 28, 2023

mvtglobally commented Nov 29, 2023

OSBotify commented Nov 29, 2023

grgia commented Nov 15, 2023 •

edited

Loading

akinwale Nov 17, 2023 •

edited

Loading