Wrong validation message when sending invoice #51545

Krishna2323 · 2024-10-27T22:41:50Z

Details

Fixed Issues

$ #49286
PROPOSAL: #49286 (comment)

Tests

Click green (+) button
Send invoice
Enter $200
Choose recipient
Fill in company name (Dubby Co)
Fill in company website (www.dubbyco.com)
Verify the entered website is displayed as valid and can be saved

Verify that no errors appear in the JS console

Offline tests

Click green (+) button
Send invoice
Enter $200
Choose recipient
Fill in company name (Dubby Co)
Fill in company website (www.dubbyco.com)
Verify the entered website is displayed as valid and can be saved

QA Steps

Click green (+) button
Send invoice
Enter $200
Choose recipient
Fill in company name (Dubby Co)
Fill in company website (www.dubbyco.com)
Verify the entered website is displayed as valid and can be saved

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: Native

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

MacOS: Desktop

desktop_app.mp4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

melvin-bot · 2024-10-27T22:41:55Z

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

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

ahmedGaber93 · 2024-10-29T16:18:22Z

src/CONST.ts

@@ -353,6 +353,7 @@ const CONST = {
        OLD_DOT_ANDROID: 'https://play.google.com/store/apps/details?id=org.me.mobiexpensifyg&hl=en_US&pli=1',
        OLD_DOT_IOS: 'https://apps.apple.com/us/app/expensify-expense-tracker/id471713959',
    },
+    URL_DEFAULT_SCHEME: 'http',


I think it will be more clean if we rename it to COMPANY_WEBSITE_DEFAULT_SCHEME because it is the default for company website only, not all URLs.

@Krishna2323 bump!

Thanks for the bump. Will finish this one today.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2024-10-30T21:42:45Z

@ahmedGaber93, should we remove the prefix from bank account step? The prefix comes from getDefaultCompanyWebsite.

App/src/libs/BankAccountUtils.ts

Lines 5 to 7 in 1351038

    
           function getDefaultCompanyWebsite(session: OnyxEntry<OnyxTypes.Session>, user: OnyxEntry<OnyxTypes.User>): string { 
        
               return user?.isFromPublicDomain ? 'https://' : `https://www.${Str.extractEmailDomain(session?.email ?? '')}`; 
        
           }

ahmedGaber93 · 2024-10-31T00:15:04Z

@Krishna2323 Yes, remove it, I think all business website inputs should be consistent.

ahmedGaber93 · 2024-10-31T19:05:45Z

src/pages/iou/request/step/IOURequestStepCompanyInfo.tsx

@@ -49,7 +49,7 @@ function IOURequestStepCompanyInfo({route, report, transaction}: IOURequestStepC
            const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.COMPANY_NAME, INPUT_IDS.COMPANY_WEBSITE]);

            if (values.companyWebsite) {
-                if (!ValidationUtils.isValidWebsite(values.companyWebsite)) {
+                if (!ValidationUtils.isValidWebsite(Str.sanitizeURL(values.companyWebsite, CONST.COMPANY_WEBSITE_DEFAULT_SCHEME))) {


I think we need to define a const companyWebsite = ... instead of inline expression, also we need to pass to IOU.sendInvoice here instead of sanitize it again here

ahmedGaber93 · 2024-10-31T19:08:19Z

src/libs/actions/Policy/Policy.ts

-        companyWebsite,
+        companyWebsite: Str.sanitizeURL(companyWebsite, CONST.COMPANY_WEBSITE_DEFAULT_SCHEME),


We don't need this, we can pass the sanitized companyWebsite value as I explained it here

ahmedGaber93 · 2024-10-31T19:11:48Z

should we remove the prefix from bank account step? The prefix comes from getDefaultCompanyWebsite.

Yes, I think all business website inputs should be consistent. Also, we can add default value getDefaultCompanyWebsite for all.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2024-11-01T22:31:56Z

@ahmedGaber93, please review it once more when you have a chance. Thanks!

ahmedGaber93 · 2024-11-03T06:29:04Z

@Krishna2323 changes looks good, just for consistent add getDefaultCompanyWebsite in all business website inputs. Also, please include videos/screenshots

…InvoicingDetailsWebsite. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

ahmedGaber93 · 2024-11-05T02:04:09Z

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

a.mp4

Android: mWeb Chrome

aw.mp4

iOS: Native

i.mp4

iOS: mWeb Safari

iw.mp4

MacOS: Chrome / Safari

20241104175829534.mp4

w.mp4

MacOS: Desktop

20241104180230959.mp4

ahmedGaber93

LGTM!

marcaaron

LGTM

OSBotify · 2024-11-05T21:59:44Z

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

github-actions · 2024-11-06T00:37:01Z

🚀 Deployed to staging by https://github.com/marcaaron in version: 9.0.58-0 🚀

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

github-actions · 2024-11-07T12:42:04Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.58-2 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	skipped 🚫
🍎🔄 iOS HybridApp 🍎🔄	skipped 🚫

Krishna2323 added 2 commits October 28, 2024 04:03

fix: Wrong validation message when sending invoice.

e0afd4c

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

use default scheme.

b80d235

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 requested a review from a team as a code owner October 27, 2024 22:41

melvin-bot bot requested a review from ahmedGaber93 October 27, 2024 22:41

melvin-bot bot removed the request for review from a team October 27, 2024 22:41

Krishna2323 added 4 commits October 28, 2024 04:29

fix conflicts.

a9a8310

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Merge branch 'Expensify:main' into krishna2323/issue/49286

14eeede

bump expensify-common version.

0bc8747

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Merge branch 'Expensify:main' into krishna2323/issue/49286

b3b0e3f

ahmedGaber93 reviewed Oct 29, 2024

View reviewed changes

minor update.

eba8073

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 force-pushed the krishna2323/issue/49286 branch from 85d59af to eba8073 Compare October 30, 2024 18:17

Krishna2323 added 2 commits October 30, 2024 23:53

Merge remote-tracking branch 'origin/main' into krishna2323/issue/49286

5f54781

sanitize URL before sending it to backend.

077960e

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

ahmedGaber93 reviewed Oct 31, 2024

View reviewed changes

Krishna2323 added 3 commits November 2, 2024 03:26

Merge branch 'Expensify:main' into krishna2323/issue/49286

157ea1e

sanitize website in the components.

0b28590

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

minor update.

9eeff4a

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

use getDefaultCompanyWebsite in IOURequestStepCompanyInfo & Workspace…

e877d60

…InvoicingDetailsWebsite. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

ahmedGaber93 approved these changes Nov 5, 2024

View reviewed changes

melvin-bot bot requested a review from marcaaron November 5, 2024 02:18

marcaaron approved these changes Nov 5, 2024

View reviewed changes

marcaaron assigned Krishna2323 Nov 5, 2024

marcaaron merged commit b80559d into Expensify:main Nov 5, 2024
19 of 20 checks passed

github-actions bot mentioned this pull request Nov 5, 2024

Deploy Checklist: New Expensify 2024-11-05 #52084

Closed

71 tasks

melvin-bot bot mentioned this pull request Nov 7, 2024

[HOLD for payment 2024-11-14] [$250] Wrong validation message when sending invoice #49286

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Wrong validation message when sending invoice #51545

Wrong validation message when sending invoice #51545

Krishna2323 commented Oct 27, 2024 •

edited

Loading

melvin-bot bot commented Oct 27, 2024

ahmedGaber93 Oct 29, 2024

ahmedGaber93 Oct 30, 2024

Krishna2323 Oct 30, 2024

Krishna2323 commented Oct 30, 2024

ahmedGaber93 commented Oct 31, 2024

ahmedGaber93 Oct 31, 2024

ahmedGaber93 Oct 31, 2024

ahmedGaber93 commented Oct 31, 2024

Krishna2323 commented Nov 1, 2024

ahmedGaber93 commented Nov 3, 2024

ahmedGaber93 commented Nov 5, 2024

ahmedGaber93 left a comment

marcaaron left a comment

OSBotify commented Nov 5, 2024

github-actions bot commented Nov 6, 2024

github-actions bot commented Nov 7, 2024

		companyWebsite,
		companyWebsite: Str.sanitizeURL(companyWebsite, CONST.COMPANY_WEBSITE_DEFAULT_SCHEME),

Wrong validation message when sending invoice #51545

Wrong validation message when sending invoice #51545

Conversation

Krishna2323 commented Oct 27, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 27, 2024

ahmedGaber93 Oct 29, 2024

Choose a reason for hiding this comment

ahmedGaber93 Oct 30, 2024

Choose a reason for hiding this comment

Krishna2323 Oct 30, 2024

Choose a reason for hiding this comment

Krishna2323 commented Oct 30, 2024

ahmedGaber93 commented Oct 31, 2024

ahmedGaber93 Oct 31, 2024

Choose a reason for hiding this comment

ahmedGaber93 Oct 31, 2024

Choose a reason for hiding this comment

ahmedGaber93 commented Oct 31, 2024

Krishna2323 commented Nov 1, 2024

ahmedGaber93 commented Nov 3, 2024

ahmedGaber93 commented Nov 5, 2024

Reviewer Checklist

Screenshots/Videos

ahmedGaber93 left a comment

Choose a reason for hiding this comment

marcaaron left a comment

Choose a reason for hiding this comment

OSBotify commented Nov 5, 2024

github-actions bot commented Nov 6, 2024

github-actions bot commented Nov 7, 2024

Krishna2323 commented Oct 27, 2024 •

edited

Loading