Merge pull request #12996 from Expensify/update-staging-from-main

Update version to 1.2.31-4 on staging

android/app/build.gradle

@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001023103
-        versionName "1.2.31-3"
+        versionCode 1001023104
+        versionName "1.2.31-4"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.31.3</string>
+	<string>1.2.31.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.31.3</string>
+	<string>1.2.31.4</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.31-3",
+  "version": "1.2.31-4",
   "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.",

src/CONST.js

@@ -689,6 +689,8 @@ const CONST = {
         },
         ROLE: {
             ADMIN: 'admin',
+            AUDITOR: 'auditor',
+            USER: 'user',
         },
         ROOM_PREFIX: '#',
         CUSTOM_UNIT_RATE_BASE_OFFSET: 100,

src/components/TextLink.js

@@ -22,20 +22,24 @@ const propTypes = {
 
     /** Overwrites the default link behavior with a custom callback */
     onPress: PropTypes.func,
+
+    /** Callback that is called when mousedown is triggered */
+    onMouseDown: PropTypes.func,
 };
 
 const defaultProps = {
     href: undefined,
     style: [],
     onPress: undefined,
+    onMouseDown: undefined,
 };
 
 const TextLink = (props) => {
     const additionalStyles = _.isArray(props.style) ? props.style : [props.style];
 
     /**
-     * @param {Event} event
-     */
+   * @param {Event} event
+   */
     const openLink = (event) => {
         event.preventDefault();
         if (props.onPress) {
@@ -47,8 +51,8 @@ const TextLink = (props) => {
     };
 
     /**
-     * @param {Event} event
-     */
+   * @param {Event} event
+   */
     const openLinkIfEnterKeyPressed = (event) => {
         if (event.key !== 'Enter') {
             return;
@@ -62,6 +66,7 @@ const TextLink = (props) => {
             accessibilityRole="link"
             href={props.href}
             onPress={openLink}
+            onMouseDown={props.onMouseDown}
             onKeyDown={openLinkIfEnterKeyPressed}
         >
             {props.children}

src/pages/ReimbursementAccount/BankAccountManualStep.js

@@ -119,7 +119,12 @@ class BankAccountManualStep extends React.Component {
                                 <Text>
                                     {this.props.translate('common.iAcceptThe')}
                                 </Text>
-                                <TextLink href="https://use.expensify.com/terms">
+                                <TextLink
+                                    href="https://use.expensify.com/terms"
+
+                                    // to call the onPress in the TextLink before the input blur is fired and shift the link element
+                                    onMouseDown={e => e.preventDefault()}
+                                >
                                     {`Expensify ${this.props.translate('common.termsOfService')}`}
                                 </TextLink>
                             </View>