fix: change styles for the requestee #25952

koko57 · 2023-08-25T15:29:34Z

Details

Fixed Issues

$ #25931
PROPOSAL: #25931

Tests

Logged in as user A request money from user B.
Log in as user B.
Go to the request details.
Verify that the styles for the user B are the same as for user A but:

there's no chevrons, items are not clickable
items are not highlighted on hover
the cursor is default
Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Logged in as user A request money from user B.
Log in as user B.
Go to the request details.
Verify that the styles for the user B are the same as for user A but:

there's no chevrons, items are not clickable
items are not highlighted on hover
the cursor is default
Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

not visible in the screenshot, but the cursor is default

Mobile Web - Chrome

Mobile Web - Safari

Desktop

not visible in the screenshot, but the cursor is default

iOS

Android

melvin-bot · 2023-08-25T16:54:35Z

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

situchan · 2023-08-25T17:04:27Z

src/components/ReportActionItem/MoneyRequestView.js

@@ -92,6 +92,8 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans

    const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);

+    const isInteractive = canEdit && !isSettled;


This condition is redundant I think. If canEdit, !isSettled already

App/src/libs/ReportUtils.js

Lines 1264 to 1267 in 643e2e8

const isReportSettled = isSettled(moneyRequestReport.reportID);

const isAdmin = isExpenseReport(moneyRequestReport) && lodashGet(getPolicy(moneyRequestReport.policyID), 'role', '') === CONST.POLICY.ROLE.ADMIN;

const isRequestor = currentUserAccountID === reportAction.actorAccountID;

return !isReportSettled && (isAdmin || isRequestor);

situchan · 2023-08-28T15:52:24Z

I am not sure this is bug but IMO when hover on text, cursor should be I-beam as text is selectable and copiable

bug.mov

situchan · 2023-08-28T15:53:42Z

@shawnborton can you please confirm - #25952 (comment)

shawnborton · 2023-08-28T16:36:23Z

That makes sense to me, yup.

Also @situchan, please use the @expensify/design team handle from here on out instead of just tagging me directly. Thanks!

koko57 · 2023-08-28T17:23:29Z

@shawnborton I can change it easily by changing cursor styles for MenuItem component - but is it ok to change it for all the components? We're using MenuItems here:

and here we're having inactive list items - should the cursor be changed to I-beam when hovering over the list items' text?

situchan · 2023-08-28T17:24:50Z

I feel like this needs to be done separately (out of scope for this PR) as already happens on production

situchan · 2023-08-28T17:25:51Z

@mountiny what do you suggest? should be fixed here or separately?

koko57 · 2023-08-28T17:26:26Z

@situchan but it's a one-liner 😃 it's ready and I can push it now, but I just wanted to make sure before I do that

situchan · 2023-08-28T17:28:01Z

@situchan but it's a one-liner 😃 it's ready and I can push it now, but I just wanted to make sure before I do that

sure we do. Just hesitated as this affects the entire app where MenuItem component is used

shawnborton · 2023-08-28T17:40:16Z

Good point, let's just leave this out for now and not worry about it.

koko57 · 2023-08-29T15:34:50Z

so we're leaving it as it is? no need to push the changes now?

situchan · 2023-08-29T15:35:53Z

so we're leaving it as it is? no need to push the changes now?

correct. I will checklist shortly

koko57 · 2023-08-29T18:00:51Z

I'll be OOO from tomorrow, but if any changes are required, someone from my team can take it over.

mountiny · 2023-08-29T22:08:03Z

@situchan @koko57 thanks for pushing this ahead, will merge once the checklist is done

JmillsExpensify · 2023-08-29T22:25:27Z

@situchan Quick heads up that this PR is clean-up for a high-priority internal initiative. It'd be great if you can prioritize this PR over your other reviews. Thanks!

situchan · 2023-08-29T22:37:13Z

on it now

situchan · 2023-08-29T23:06:00Z

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 / Chrome
- iOS / native
- iOS / 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

Web

web.mov

Mobile Web - Chrome

mchrome.mov

Mobile Web - Safari

msafari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

android.mov

situchan

mountiny

Thanks 🚀

OSBotify · 2023-08-30T03:37:34Z

✋ 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-08-31T01:02:06Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.60-0 🚀

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

OSBotify · 2023-08-31T01:45:31Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.60-0 🚀

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

OSBotify · 2023-08-31T22:49:43Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.60-3 🚀

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

fix: change styles for the requestee

8923013

koko57 marked this pull request as ready for review August 25, 2023 16:54

koko57 requested a review from a team as a code owner August 25, 2023 16:54

melvin-bot bot requested review from situchan and removed request for a team August 25, 2023 16:54

situchan reviewed Aug 25, 2023

View reviewed changes

koko57 added 2 commits August 28, 2023 10:32

fix: apply requested changes

2bd2f48

Merge branch 'main' into fix/25931-update-styles-for-the-requestee

44c6114

mountiny assigned koko57 Aug 29, 2023

mountiny self-requested a review August 29, 2023 22:07

situchan approved these changes Aug 29, 2023

View reviewed changes

mountiny approved these changes Aug 30, 2023

View reviewed changes

mountiny merged commit bb432aa into Expensify:main Aug 30, 2023
12 checks passed

OSBotify mentioned this pull request Aug 31, 2023

Deploy Checklist: New Expensify 2023-08-31 #26359

Closed

69 tasks

melvin-bot bot mentioned this pull request Aug 31, 2023

[$500] [HOLD for payment 2023-09-07] Update styles for money request header user cannot edit #25931

Closed

koko57 deleted the fix/25931-update-styles-for-the-requestee branch September 28, 2023 15:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: change styles for the requestee #25952

fix: change styles for the requestee #25952

koko57 commented Aug 25, 2023 •

edited

Loading

melvin-bot bot commented Aug 25, 2023

situchan Aug 25, 2023

situchan commented Aug 28, 2023

situchan commented Aug 28, 2023

shawnborton commented Aug 28, 2023

koko57 commented Aug 28, 2023

situchan commented Aug 28, 2023

situchan commented Aug 28, 2023

koko57 commented Aug 28, 2023

situchan commented Aug 28, 2023

shawnborton commented Aug 28, 2023

koko57 commented Aug 29, 2023

situchan commented Aug 29, 2023

koko57 commented Aug 29, 2023

mountiny commented Aug 29, 2023

JmillsExpensify commented Aug 29, 2023

situchan commented Aug 29, 2023

situchan commented Aug 29, 2023

situchan left a comment

mountiny left a comment

OSBotify commented Aug 30, 2023

OSBotify commented Aug 31, 2023

OSBotify commented Aug 31, 2023

OSBotify commented Aug 31, 2023

		@@ -92,6 +92,8 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans

		const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);

		const isInteractive = canEdit && !isSettled;

	const isReportSettled = isSettled(moneyRequestReport.reportID);
	const isAdmin = isExpenseReport(moneyRequestReport) && lodashGet(getPolicy(moneyRequestReport.policyID), 'role', '') === CONST.POLICY.ROLE.ADMIN;
	const isRequestor = currentUserAccountID === reportAction.actorAccountID;
	return !isReportSettled && (isAdmin \|\| isRequestor);

fix: change styles for the requestee #25952

fix: change styles for the requestee #25952

Conversation

koko57 commented Aug 25, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 25, 2023

situchan Aug 25, 2023

Choose a reason for hiding this comment

situchan commented Aug 28, 2023

situchan commented Aug 28, 2023

shawnborton commented Aug 28, 2023

koko57 commented Aug 28, 2023

situchan commented Aug 28, 2023

situchan commented Aug 28, 2023

koko57 commented Aug 28, 2023

situchan commented Aug 28, 2023

shawnborton commented Aug 28, 2023

koko57 commented Aug 29, 2023

situchan commented Aug 29, 2023

koko57 commented Aug 29, 2023

mountiny commented Aug 29, 2023

JmillsExpensify commented Aug 29, 2023

situchan commented Aug 29, 2023

situchan commented Aug 29, 2023

Reviewer Checklist

Screenshots/Videos

situchan left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 30, 2023

OSBotify commented Aug 31, 2023

OSBotify commented Aug 31, 2023

OSBotify commented Aug 31, 2023

koko57 commented Aug 25, 2023 •

edited

Loading