Merge pull request #62207 from callstack-internal/fix/62110-company-website-default-value

fix: 62110 save default value for company website

Author: madmax330

src/pages/ReimbursementAccount/NonUSD/BusinessInfo/subSteps/Website.tsx

@@ -47,11 +47,11 @@ function Website({onNext, onMove, isEditing}: WebsiteProps) {
     const handleSubmit = useReimbursementAccountStepFormSubmit({
         fieldIds: STEP_FIELDS,
         onNext: (values) => {
-            const website = Str.sanitizeURL((values as {website: string})?.website, CONST.COMPANY_WEBSITE_DEFAULT_SCHEME);
+            const website = Str.sanitizeURL((values as {websiteUrl: string})?.websiteUrl, CONST.COMPANY_WEBSITE_DEFAULT_SCHEME);
             setDraftValues(ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM, {[COMPANY_WEBSITE]: website});
             onNext();
         },
-        shouldSaveDraft: isEditing,
+        shouldSaveDraft: true,
     });
 
     return (

src/pages/ReimbursementAccount/NonUSD/utils/getInitialSubStepForBusinessInfoStep.ts

@@ -11,6 +11,10 @@ function getInitialSubStepForBusinessInfoStep(data: Record<string, string>): num
         return 0;
     }
 
+    if (data[BUSINESS_INFO_STEP_KEYS.COMPANY_WEBSITE] === '') {
+        return 1;
+    }
+
     if (
         data[BUSINESS_INFO_STEP_KEYS.COMPANY_STREET] === '' ||
         data[BUSINESS_INFO_STEP_KEYS.COMPANY_CITY] === '' ||
@@ -20,19 +24,19 @@ function getInitialSubStepForBusinessInfoStep(data: Record<string, string>): num
             data[BUSINESS_INFO_STEP_KEYS.COMPANY_STATE] === '') ||
         (data[BUSINESS_INFO_STEP_KEYS.COMPANY_COUNTRY_CODE] === '' && data[BUSINESS_INFO_STEP_KEYS.COMPANY_STATE] === '')
     ) {
-        return 1;
+        return 2;
     }
 
     if (data[BUSINESS_INFO_STEP_KEYS.BUSINESS_CONTACT_NUMBER] === '' || data[BUSINESS_INFO_STEP_KEYS.BUSINESS_CONFIRMATION_EMAIL] === '') {
-        return 2;
+        return 3;
     }
 
     if (data[BUSINESS_INFO_STEP_KEYS.BUSINESS_REGISTRATION_INCORPORATION_NUMBER] === '') {
-        return 3;
+        return 4;
     }
 
     if (data[BUSINESS_INFO_STEP_KEYS.TAX_ID_EIN_NUMBER] === '') {
-        return 4;
+        return 5;
     }
 
     if (
@@ -41,22 +45,22 @@ function getInitialSubStepForBusinessInfoStep(data: Record<string, string>): num
             data[BUSINESS_INFO_STEP_KEYS.FORMATION_INCORPORATION_COUNTRY_CODE] === CONST.COUNTRY.CA) &&
             data[BUSINESS_INFO_STEP_KEYS.FORMATION_INCORPORATION_STATE] === '')
     ) {
-        return 5;
+        return 6;
     }
 
     if (data[BUSINESS_INFO_STEP_KEYS.BUSINESS_CATEGORY] === '' || data[BUSINESS_INFO_STEP_KEYS.APPLICANT_TYPE_ID] === '') {
-        return 6;
+        return 7;
     }
 
     if (data[BUSINESS_INFO_STEP_KEYS.ANNUAL_VOLUME] === '') {
-        return 7;
+        return 8;
     }
 
     if (data[BUSINESS_INFO_STEP_KEYS.TRADE_VOLUME] === '') {
-        return 8;
+        return 9;
     }
 
-    return 9;
+    return 10;
 }
 
 export default getInitialSubStepForBusinessInfoStep;