Fix: Inconsistent capitalization in product #17327

dukenv0307 · 2023-04-12T07:29:52Z

Details

Inconsistent capitalization in product

Fixed Issues

$ #17239
PROPOSAL: #17239 (comment)

Tests

Note: Case 1 in test could be only tested in desktop web and desktop app

The 'C' should be small in the tooltip for the call icon

Login with any account
Go to any chat
Hover call icon
Verify that the content of tooltip is "Start a call"

Text in Transfer Balance modal should be consistent capitalization and the header in Choose Transfer Account modal "A" should be in small letters

Login with any account
Go to Setting > Payments > Transfer balance if account has balance or go to url '/settings/payments/transfer-balance' if else
Verify that the header in this modal is 'Transfer balance'
Verify that option 1 is "Instant (Debit card)"
Verify that option 2 is "1-3 Business days (Bank account)"
Verify that the text that below two option is "Which account"
Select any option to go to Choose Transfer Account modal
Verify that the header in this modal is 'Choose account'

"Terms of Service" and "Privacy" text should be consistent in product

Go to login page
Enter the email of your account and click continue
In the page to enter the password, verify that the term text is "By logging in, you agree to the Terms of Service and Privacy."
Enter your password to login
After login successfully, go to Setting > About
Verify that the content in footer is "Read the Terms of Service and Privacy"
Switch to Spanish language
Go to Setting > Workspaces > Connect bank account
In step 1, doesn't check to checkbox and click Continue button
Verify that error message "Debes aceptar los Términos de Servicio para continuar" is displayed below checkbox

The header in the Delete Account modal "A" should be in small letters

Login with any account
Go to Setting > Payments
Select a payment method to delete
Verify that the header in the Delete account modal is "Delete account"

Uploading Attachment... message "A" should be in small letters

Login with any account
Go to any chat
Upload a attachment
Verify that Uploading attachment message is 'Uploading attachment'

Error in add bank account form should be consistent capitalization

Login with any account
Open Setting > Workspaces
Open any workspaces
Open connect bank account
Click on connect manually
In step 1, without filling any detail, click on continue
Verify that the error message of Routing number field is "Please enter a valid routing number"
Verify that the error message of Account number is "Please enter a valid account number"
Fill in detail in step one with valid value, accept terms and click continue to go to step 2 (i.e routin no = 123456780, account no = 123456789)
In step 2, without filling any detail, click on save & continue
Verify that the error message of Tax ID number field is "Please enter a valid tax ID number"
Verify that the error message of Company type is "Please enter a valid company type"
Verify that the error message of Company address is "Please enter a valid street address that is not a PO box"

Verify that no errors appear in the JS console

Offline tests

Same above

QA Steps

Note: Case 1 in test could be only tested in desktop web and desktop app

The 'C' should be small in the tooltip for the call icon

Login with any account
Go to any chat
Hover call icon
Verify that the content of tooltip is "Start a call"

Text in Transfer Balance modal should be consistent capitalization and the header in Choose Transfer Account modal "A" should be in small letters

Login with any account
Go to Setting > Payments > Transfer balance if account has balance or go to url '/settings/payments/transfer-balance' if else
Verify that the header in this modal is 'Transfer balance'
Verify that option 1 is "Instant (Debit card)"
Verify that option 2 is "1-3 Business days (Bank account)"
Verify that the text that below two option is "Which account"
Select any option to go to Choose Transfer Account modal
Verify that the header in this modal is 'Choose account'

"Terms of Service" and "Privacy" text should be consistent in product

Go to login page
Enter the email of your account and click continue
In the page to enter the password, verify that the term text is "By logging in, you agree to the Terms of Service and Privacy."
Enter your password to login
After login successfully, go to Setting > About
Verify that the content in footer is "Read the Terms of Service and Privacy"
Switch to Spanish language
Go to Setting > Workspaces > Connect bank account
In step 1, doesn't check to checkbox and click Continue button
Verify that error message "Debes aceptar los Términos de Servicio para continuar" is displayed below checkbox

The header in the Delete Account modal "A" should be in small letters

Login with any account
Go to Setting > Payments
Select a payment method to delete
Verify that the header in the Delete account modal is "Delete account"

Uploading Attachment... message "A" should be in small letters

Login with any account
Go to any chat
Upload a attachment
Verify that Uploading attachment message is 'Uploading attachment'

Error in add bank account form should be consistent capitalization

Login with any account
Open Setting > Workspaces
Open any workspaces
Open connect bank account
Click on connect manually
In step 1, without filling any detail, click on continue
Verify that the error message of Routing number field is "Please enter a valid routing number"
Verify that the error message of Account number is "Please enter a valid account number"
Fill in detail in step one with valid value, accept terms and click continue to go to step 2 (i.e routin no = 123456780, account no = 123456789)
In step 2, without filling any detail, click on save & continue
Verify that the error message of Tax ID number field is "Please enter a valid tax ID number"
Verify that the error message of Company type is "Please enter a valid company type"
Verify that the error message of Company address is "Please enter a valid street address that is not a PO box"

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

The 'C' should be small in the tooltip for the call icon

Text in Transfer Balance modal should be consistent capitalization and the header in Choose Transfer Account modal "A" should be in small letters

"Terms of Service" and "Privacy" text should be consistent in product

The header in the Delete Account modal "A" should be in small letters

Uploading Attachment... message "A" should be in small letters

Error in add bank account form should be consistent capitalization

Mobile Web - Chrome

Text in Transfer Balance modal should be consistent capitalization and the header in Choose Transfer Account modal "A" should be in small letters

"Terms of Service" and "Privacy" text should be consistent in product

The header in the Delete Account modal "A" should be in small letters

Uploading Attachment... message "A" should be in small letters

Error in add bank account form should be consistent capitalization

Mobile Web - Safari

Text in Transfer Balance modal should be consistent capitalization and the header in Choose Transfer Account modal "A" should be in small letters

"Terms of Service" text should be consistent in product

The header in the Delete Account modal "A" should be in small letters

Uploading Attachment... message "A" should be in small letters

Error in add bank account form should be consistent capitalization

Desktop

The 'C' should be small in the tooltip for the call icon

Text in Transfer Balance modal should be consistent capitalization and the header in Choose Transfer Account modal "A" should be in small letters

"Terms of Service" and "Privacy" text should be consistent in product

The header in the Delete Account modal "A" should be in small letters

Uploading Attachment... message "A" should be in small letters

Error in add bank account form should be consistent capitalization

iOS

Text in Transfer Balance modal should be consistent capitalization and the header in Choose Transfer Account modal "A" should be in small letters

"Terms of Service" and "Privacy" text should be consistent in product

The header in the Delete Account modal "A" should be in small letters

Uploading Attachment... message "A" should be in small letters

Error in add bank account form should be consistent capitalization

Android

Text in Transfer Balance modal should be consistent capitalization and the header in Choose Transfer Account modal "A" should be in small letters

"Terms of Service" and "Privacy" text should be consistent in product

The header in the Delete Account modal "A" should be in small letters

Uploading Attachment... message "A" should be in small letters

Error in add bank account form should be consistent capitalization

MelvinBot · 2023-04-13T11:07:20Z

@thienlnam @0xmiroslav 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]

0xmiros · 2023-04-13T11:57:24Z

src/libs/ReportUtils.js

@@ -930,7 +930,7 @@ function buildOptimisticAddCommentReportAction(text, file) {
    const commentText = getParsedComment(text);
    const isAttachment = _.isEmpty(text) && file !== undefined;
    const attachmentInfo = isAttachment ? file : {};
-    const htmlForNewComment = isAttachment ? 'Uploading Attachment...' : commentText;
+    const htmlForNewComment = isAttachment ? 'Uploading attachment...' : commentText;


@thienlnam should we localize this for Spanish? I think this place is fine for now because we'll be deprecating uploading message.
https://expensify.slack.com/archives/C01GTK53T8Q/p1664819628960309

Nice catch, yeah I'm not sure why this copy was not ever localized. Agree we can just leave it since we're going to be removing it soon

src/languages/es.js

0xmiros · 2023-04-13T16:53:52Z

And don't force-push

dukenv0307 · 2023-04-13T16:56:49Z

@0xmiroslav Noted, thanks for reminding me. Please help to check again

dukenv0307 · 2023-04-18T02:23:13Z

@0xmiroslav @thienlnam Please help to check this PR and ping me if there are any problems.

0xmiros · 2023-04-18T03:12:04Z

Still waiting for confirmation - #17239 (comment)

thienlnam · 2023-04-18T19:45:34Z

Sasha left some confirmation - let's also make sure to address the cases in the latest merged issue, this should address all the inconsistent capitalization in product

dukenv0307 · 2023-04-19T04:47:39Z

@thienlnam @0xmiroslav I just updated the PR, please help to check again and I will update screenshots after your confirmation

0xmiros · 2023-04-19T05:29:25Z

@dukenv0307 confirmed. please go ahead screenshots

dukenv0307 · 2023-04-19T08:07:17Z

@0xmiroslav I just updated all screenshot, help to check again

0xmiros · 2023-04-19T09:03:42Z

@dukenv0307 on which platform can I see Spanish changes?

0xmiros · 2023-04-19T09:05:12Z

@dukenv0307 please pull from main. Branding changed on Login page

dukenv0307 · 2023-04-19T09:15:45Z

@0xmiroslav Spanish changes only in case "Terms of Service" and "Privacy" text should be consistent in product and you can see it in all platform

dukenv0307 · 2023-04-19T09:36:49Z

@0xmiroslav Login page changed in main but this text is same. Do I need to update screenshots in login page

…duct

0xmiros · 2023-04-19T11:45:07Z

@0xmiroslav Login page changed in main but this text is same. Do I need to update screenshots in login page

yes please

0xmiros · 2023-04-19T13:12:34Z

@dukenv0307 did you update?

dukenv0307 · 2023-04-19T13:30:56Z

@0xmiroslav sorry I was busy earlier, I will update it right now

dukenv0307 · 2023-04-19T14:09:07Z

@0xmiroslav I just updated. Help to check again

0xmiros · 2023-04-19T14:39:23Z

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

0xmiros

2 minor concerns:

Inconsistency - (Debit card), (Bank account) is missing in Spanish. This is not capitalization issue so out of scope.

Terms of Service and Privacy capitalization together in a sentence (already raised in linked issue but got no answer yet)

Other than that, looks good.
cc: @thienlnam

thienlnam

Looks good! Thanks for the review, going to wait for confirmation but I agree with your stance on the capitalization

0xmiros · 2023-04-21T03:02:08Z

@dukenv0307 minor one:
Sole Proprietorship -> Sole proprietorship

…tps://github.com/dukenv0307/App into fix/17239-inconsistent-capitalization-in-product

dukenv0307 · 2023-04-21T03:09:38Z

@0xmiroslav I just fixed, please check again

0xmiros

Thanks for the quick fix. We're still waiting for "Terms of Service and Privacy" confirmation before final merge.

thienlnam

Cool we're good to go here! Nice work everyone

OSBotify · 2023-04-21T18:01:12Z

✋ 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-04-21T21:45:22Z

🚀 Deployed to staging by https://github.com/thienlnam in version: 1.3.4-0 🚀

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

OSBotify · 2023-04-25T05:18:33Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.4-0 🚀

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

dukenv0307 marked this pull request as ready for review April 13, 2023 11:07

dukenv0307 requested a review from a team as a code owner April 13, 2023 11:07

melvin-bot bot requested review from 0xmiros and thienlnam and removed request for a team April 13, 2023 11:07

dukenv0307 mentioned this pull request Apr 13, 2023

[HOLD for payment 2023-05-02] [$1000] Inconsistent capitalization in product #17239

Closed

6 tasks

0xmiros reviewed Apr 13, 2023

View reviewed changes

dukenv0307 added 3 commits April 13, 2023 23:45

fix: inconsistent capitalization in product

67bea0e

fix more inconsistent capitalization in product

bf78b79

fix inconsistent capitalization of acceptTerms text in Spanish language

056540c

dukenv0307 force-pushed the fix/17239-inconsistent-capitalization-in-product branch from f210d08 to f3cfbce Compare April 13, 2023 16:49

0xmiros reviewed Apr 13, 2023

View reviewed changes

src/languages/es.js Outdated Show resolved Hide resolved

resolve conflict

a007c2c

dukenv0307 force-pushed the fix/17239-inconsistent-capitalization-in-product branch from f3cfbce to a007c2c Compare April 13, 2023 16:53

fix inconsistent capitalization in error of add bank account form

43b6d83

Merge branch 'main' into fix/17239-inconsistent-capitalization-in-pro…

59ec56a

…duct

fix: merge main

e99b3f5

0xmiros previously approved these changes Apr 19, 2023

View reviewed changes

thienlnam previously approved these changes Apr 19, 2023

View reviewed changes

dukenv0307 added 2 commits April 21, 2023 10:07

fix inconsistent capitalization in incorporationTypes

c1369d9

Merge branch 'fix/17239-inconsistent-capitalization-in-product' of ht…

1534e19

…tps://github.com/dukenv0307/App into fix/17239-inconsistent-capitalization-in-product

dukenv0307 dismissed stale reviews from thienlnam and 0xmiros via 1534e19 April 21, 2023 03:08

0xmiros approved these changes Apr 21, 2023

View reviewed changes

thienlnam approved these changes Apr 21, 2023

View reviewed changes

thienlnam merged commit ab669ad into Expensify:main Apr 21, 2023

OSBotify mentioned this pull request Apr 21, 2023

Deploy Checklist: New Expensify 2023-04-21 #17804

Closed

14 tasks

kbecciv mentioned this pull request Apr 23, 2023

[HOLD for payment 2023-06-02] [$1000] Web - Transfer Balance page - $NaN instead of amount for policy with currency other than USD #17869

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Inconsistent capitalization in product #17327

Fix: Inconsistent capitalization in product #17327

dukenv0307 commented Apr 12, 2023 •

edited

Loading

MelvinBot commented Apr 13, 2023

0xmiros Apr 13, 2023

thienlnam Apr 13, 2023

0xmiros commented Apr 13, 2023

dukenv0307 commented Apr 13, 2023 •

edited

Loading

dukenv0307 commented Apr 18, 2023 •

edited

Loading

0xmiros commented Apr 18, 2023

thienlnam commented Apr 18, 2023

dukenv0307 commented Apr 19, 2023 •

edited

Loading

0xmiros commented Apr 19, 2023

dukenv0307 commented Apr 19, 2023

0xmiros commented Apr 19, 2023

0xmiros commented Apr 19, 2023

dukenv0307 commented Apr 19, 2023

dukenv0307 commented Apr 19, 2023

0xmiros commented Apr 19, 2023

0xmiros commented Apr 19, 2023

dukenv0307 commented Apr 19, 2023

dukenv0307 commented Apr 19, 2023

0xmiros commented Apr 19, 2023

0xmiros left a comment

thienlnam left a comment

0xmiros commented Apr 21, 2023

dukenv0307 commented Apr 21, 2023

0xmiros left a comment

thienlnam left a comment

OSBotify commented Apr 21, 2023

OSBotify commented Apr 21, 2023

OSBotify commented Apr 25, 2023

Fix: Inconsistent capitalization in product #17327

Fix: Inconsistent capitalization in product #17327

Conversation

dukenv0307 commented Apr 12, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

MelvinBot commented Apr 13, 2023

0xmiros Apr 13, 2023

Choose a reason for hiding this comment

thienlnam Apr 13, 2023

Choose a reason for hiding this comment

0xmiros commented Apr 13, 2023

dukenv0307 commented Apr 13, 2023 • edited Loading

dukenv0307 commented Apr 18, 2023 • edited Loading

0xmiros commented Apr 18, 2023

thienlnam commented Apr 18, 2023

dukenv0307 commented Apr 19, 2023 • edited Loading

0xmiros commented Apr 19, 2023

dukenv0307 commented Apr 19, 2023

0xmiros commented Apr 19, 2023

0xmiros commented Apr 19, 2023

dukenv0307 commented Apr 19, 2023

dukenv0307 commented Apr 19, 2023

0xmiros commented Apr 19, 2023

0xmiros commented Apr 19, 2023

dukenv0307 commented Apr 19, 2023

dukenv0307 commented Apr 19, 2023

0xmiros commented Apr 19, 2023

Reviewer Checklist

Screenshots/Videos

0xmiros left a comment

Choose a reason for hiding this comment

thienlnam left a comment

Choose a reason for hiding this comment

0xmiros commented Apr 21, 2023

dukenv0307 commented Apr 21, 2023

0xmiros left a comment

Choose a reason for hiding this comment

thienlnam left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 21, 2023

OSBotify commented Apr 21, 2023

OSBotify commented Apr 25, 2023

dukenv0307 commented Apr 12, 2023 •

edited

Loading

dukenv0307 commented Apr 13, 2023 •

edited

Loading

dukenv0307 commented Apr 18, 2023 •

edited

Loading

dukenv0307 commented Apr 19, 2023 •

edited

Loading