Merge branch 'main' into edu/17548_personal_details_push_to_page

* main: (273 commits) edit comment fix lint Hidden reveal message button when editing message Update version to 1.3.27-6 Manually add back eslint-ignore comments for props spreading Use eslint --fix and prettier to update all function components to use the function keyword Update eslint-config-expensify to latest Update version to 1.3.27-5 adding accessibilityLabel and accessibilityRole remove comment added a comment removed @default unnecessary space added propTypes Updating to PressableWithoutFeedback added to propType correction added props to PressableWithFeedback add cancelButtonID native id Update version to 1.3.27-4 ... # Conflicts: # src/components/MenuItemWithTopDescription.js # src/pages/ReimbursementAccount/AddressForm.js
Expensify · Jun 14, 2023 · 6b11127 · 6b11127
2 parents 1cfa2ba + 23978e4
commit 6b11127
Show file tree

Hide file tree

Showing 393 changed files with 4,032 additions and 3,473 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -31,6 +31,11 @@ module.exports = {
                         importNames: ['TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight'],
                         message: 'Please use PressableWithFeedback and/or PressableWithoutFeedback from src/components/Pressable instead',
                     },
+                    {
+                        name: 'react-native',
+                        importNames: ['StatusBar'],
+                        message: 'Please use StatusBar from src/libs/StatusBar instead',
+                    },
                 ],
             },
         ],

diff --git a/.well-known/apple-app-site-association b/.well-known/apple-app-site-association
@@ -12,10 +12,6 @@
                         "/": "/settings/*",
                         "comment": "Profile and app settings"
                     },
-                    {
-                        "/": "/setpassword/*",
-                        "comment": "Passoword setup"
-                    },
                     {
                         "/": "/details/*",
                         "comment": "Details of another users"

diff --git a/__mocks__/react-native-safe-area-context.js b/__mocks__/react-native-safe-area-context.js
@@ -9,15 +9,17 @@ const insets = {
 };
 
 function withSafeAreaInsets(WrappedComponent) {
-    const WithSafeAreaInsets = (props) => (
-        <WrappedComponent
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-            // eslint-disable-next-line react/prop-types
-            ref={props.forwardedRef}
-            insets={insets}
-        />
-    );
+    function WithSafeAreaInsets(props) {
+        return (
+            <WrappedComponent
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+                // eslint-disable-next-line react/prop-types
+                ref={props.forwardedRef}
+                insets={insets}
+            />
+        );
+    }
     return forwardRef((props, ref) => (
         <WithSafeAreaInsets
             // eslint-disable-next-line react/jsx-props-no-spreading

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001032601
-        versionName "1.3.26-1"
+        versionCode 1001032706
+        versionName "1.3.27-6"
     }
 
     splits {

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -52,7 +52,6 @@
             <!-- Production URLs -->
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/r"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/settings"/>
-            <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/setpassword"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/details"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/v"/>
             <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/bank-account"/>
@@ -64,7 +63,6 @@
             <!-- Staging URLs -->
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/settings"/>
-            <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/setpassword"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/details"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/v"/>
             <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/bank-account"/>

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.26</string>
+	<string>1.3.27</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.26.1</string>
+	<string>1.3.27.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.26</string>
+	<string>1.3.27</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.26.1</string>
+	<string>1.3.27.6</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.26-1",
+  "version": "1.3.27-6",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -76,7 +76,7 @@
     "babel-polyfill": "^6.26.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#925e62744f784a92c3ad8947aabfc21c93bec221",
+    "expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#50aacd53fe54ef7131e5cb9c74ee4526b3bcfe16",
     "fbjs": "^3.0.2",
     "html-entities": "^1.3.1",
     "htmlparser2": "^7.2.0",
@@ -183,7 +183,7 @@
     "electron": "22.3.7",
     "electron-builder": "24.4.0",
     "eslint": "^7.6.0",
-    "eslint-config-expensify": "^2.0.36",
+    "eslint-config-expensify": "^2.0.38",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-jest": "^24.1.0",
     "eslint-plugin-jsx-a11y": "^6.6.1",

diff --git a/src/App.js b/src/App.js
@@ -33,29 +33,31 @@ LogBox.ignoreLogs([
 
 const fill = {flex: 1};
 
-const App = () => (
-    <GestureHandlerRootView style={fill}>
-        <ComposeProviders
-            components={[
-                OnyxProvider,
-                SafeAreaProvider,
-                PortalProvider,
-                SafeArea,
-                LocaleContextProvider,
-                HTMLEngineProvider,
-                WindowDimensionsProvider,
-                KeyboardStateProvider,
-                CurrentReportIdContextProvider,
-                PickerStateProvider,
-            ]}
-        >
-            <CustomStatusBar />
-            <ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
-                <Expensify />
-            </ErrorBoundary>
-        </ComposeProviders>
-    </GestureHandlerRootView>
-);
+function App() {
+    return (
+        <GestureHandlerRootView style={fill}>
+            <ComposeProviders
+                components={[
+                    OnyxProvider,
+                    SafeAreaProvider,
+                    PortalProvider,
+                    SafeArea,
+                    LocaleContextProvider,
+                    HTMLEngineProvider,
+                    WindowDimensionsProvider,
+                    KeyboardStateProvider,
+                    CurrentReportIdContextProvider,
+                    PickerStateProvider,
+                ]}
+            >
+                <CustomStatusBar />
+                <ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
+                    <Expensify />
+                </ErrorBoundary>
+            </ComposeProviders>
+        </GestureHandlerRootView>
+    );
+}
 
 App.displayName = 'App';
 

diff --git a/src/CONST.js b/src/CONST.js
@@ -450,6 +450,7 @@ const CONST = {
     PDF_VIEWER_URL: '/pdf/web/viewer.html',
     CLOUDFRONT_DOMAIN_REGEX: /^https:\/\/\w+\.cloudfront\.net/i,
     EXPENSIFY_ICON_URL: `${CLOUDFRONT_URL}/images/favicon-2019.png`,
+    CONCIERGE_ICON_URL_2021: `${CLOUDFRONT_URL}/images/icons/concierge_2021.png`,
     CONCIERGE_ICON_URL: `${CLOUDFRONT_URL}/images/icons/concierge_2022.png`,
     UPWORK_URL: 'https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22',
     GITHUB_URL: 'https://github.com/Expensify/App',
@@ -829,6 +830,7 @@ const CONST = {
         WIDTH: 320,
         HEIGHT: 416,
     },
+    DESKTOP_HEADER_PADDING: 12,
     CATEGORY_SHORTCUT_BAR_HEIGHT: 32,
     SMALL_EMOJI_PICKER_SIZE: {
         WIDTH: '100%',
@@ -1107,7 +1109,7 @@ const CONST = {
         CARD_NUMBER: /^[0-9]{15,16}$/,
         CARD_SECURITY_CODE: /^[0-9]{3,4}$/,
         CARD_EXPIRATION_DATE: /^(0[1-9]|1[0-2])([^0-9])?([0-9]{4}|([0-9]{2}))$/,
-        PAYPAL_ME_USERNAME: /^[a-zA-Z0-9]+$/,
+        PAYPAL_ME_USERNAME: /^[a-zA-Z0-9]{1,20}$/,
         ROOM_NAME: /^#[a-z0-9-]{1,80}$/,
 
         // eslint-disable-next-line max-len, no-misleading-character-class
@@ -2436,9 +2438,9 @@ const CONST = {
     },
     SPACE_CHARACTER_WIDTH: 4,
 
-    // This ID is used in SelectionScraper.js to query the DOM for UnreadActionIndicator's
-    // div and then remove it from copied contents in the getHTMLOfSelection() method.
-    UNREAD_ACTION_INDICATOR_ID: 'no-copy-area-unread-action-indicator',
+    // The attribute used in the SelectionScraper.js helper to query all the DOM elements
+    // that should be removed from the copied contents in the getHTMLOfSelection() method
+    SELECTION_SCRAPER_HIDDEN_ELEMENT: 'selection-scrapper-hidden-element',
     MODERATION: {
         MODERATOR_DECISION_PENDING: 'pending',
         MODERATOR_DECISION_PENDING_HIDE: 'pendingHide',

diff --git a/src/ROUTES.js b/src/ROUTES.js
@@ -114,7 +114,6 @@ export default {
     FLAG_COMMENT: `flag/:reportID/:reportActionID`,
     getFlagCommentRoute: (reportID, reportActionID) => `flag/${reportID}/${reportActionID}`,
     SEARCH: 'search',
-    SET_PASSWORD_WITH_VALIDATE_CODE: 'setpassword/:accountID/:validateCode',
     DETAILS: 'details',
     getDetailsRoute: (login) => `details?login=${encodeURIComponent(login)}`,
     PROFILE: 'a/:accountID',

diff --git a/src/components/AddPaymentMethodMenu.js b/src/components/AddPaymentMethodMenu.js
@@ -43,41 +43,43 @@ const defaultProps = {
     betas: [],
 };
 
-const AddPaymentMethodMenu = (props) => (
-    <PopoverMenu
-        isVisible={props.isVisible}
-        onClose={props.onClose}
-        anchorPosition={props.anchorPosition}
-        onItemSelected={props.onClose}
-        menuItems={[
-            {
-                text: props.translate('common.bankAccount'),
-                icon: Expensicons.Bank,
-                onSelected: () => {
-                    props.onItemSelected(CONST.PAYMENT_METHODS.BANK_ACCOUNT);
+function AddPaymentMethodMenu(props) {
+    return (
+        <PopoverMenu
+            isVisible={props.isVisible}
+            onClose={props.onClose}
+            anchorPosition={props.anchorPosition}
+            onItemSelected={props.onClose}
+            menuItems={[
+                {
+                    text: props.translate('common.bankAccount'),
+                    icon: Expensicons.Bank,
+                    onSelected: () => {
+                        props.onItemSelected(CONST.PAYMENT_METHODS.BANK_ACCOUNT);
+                    },
                 },
-            },
-            ...(Permissions.canUseWallet(props.betas)
-                ? [
-                      {
-                          text: props.translate('common.debitCard'),
-                          icon: Expensicons.CreditCard,
-                          onSelected: () => props.onItemSelected(CONST.PAYMENT_METHODS.DEBIT_CARD),
-                      },
-                  ]
-                : []),
-            ...(props.shouldShowPaypal && !props.payPalMeData.description
-                ? [
-                      {
-                          text: props.translate('common.payPalMe'),
-                          icon: Expensicons.PayPal,
-                          onSelected: () => props.onItemSelected(CONST.PAYMENT_METHODS.PAYPAL),
-                      },
-                  ]
-                : []),
-        ]}
-    />
-);
+                ...(Permissions.canUseWallet(props.betas)
+                    ? [
+                          {
+                              text: props.translate('common.debitCard'),
+                              icon: Expensicons.CreditCard,
+                              onSelected: () => props.onItemSelected(CONST.PAYMENT_METHODS.DEBIT_CARD),
+                          },
+                      ]
+                    : []),
+                ...(props.shouldShowPaypal && !props.payPalMeData.description
+                    ? [
+                          {
+                              text: props.translate('common.payPalMe'),
+                              icon: Expensicons.PayPal,
+                              onSelected: () => props.onItemSelected(CONST.PAYMENT_METHODS.PAYPAL),
+                          },
+                      ]
+                    : []),
+            ]}
+        />
+    );
+}
 
 AddPaymentMethodMenu.propTypes = propTypes;
 AddPaymentMethodMenu.defaultProps = defaultProps;