Merge branch 'main' into fix/33143-timepicker-selection

.github/workflows/platformDeploy.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   SHOULD_DEPLOY_PRODUCTION: ${{ github.event_name == 'release' }}
-  DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}
@@ -300,7 +300,7 @@ jobs:
         uses: ./.github/actions/composite/setupNode
 
       - name: Setup Cloudflare CLI
-        run: pip3 install cloudflare==2.14.3
+        run: pip3 install cloudflare
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4

.github/workflows/testBuild.yml

@@ -11,7 +11,7 @@ on:
     branches: ['*ci-test/**']
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
 
 jobs:
   validateActor:
@@ -159,7 +159,7 @@ jobs:
         uses: ./.github/actions/composite/setupNode
 
       - name: Setup XCode
-        run: sudo xcode-select -switch /Applications/Xcode_14.2.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011

android/app/build.gradle

@@ -96,8 +96,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001041900
-        versionName "1.4.19-0"
+        versionCode 1001042002
+        versionName "1.4.20-2"
     }
 
     flavorDimensions "default"

docs/_data/_routes.yml

@@ -113,8 +113,8 @@ platforms:
         icon: /assets/images/hand-card.svg
         description: Explore how the Expensify Card combines convenience and security to enhance everyday business transactions. Discover how to apply for, oversee, and maximize your card perks here.
 
-      - href: get-paid-back
-        title: Get Paid Back
+      - href: payments
+        title: Payments
         icon: /assets/images/money-into-wallet.svg
         description: Whether you submit an expense report or an invoice, find out here how to ensure a smooth and timely payback process every time.
 

docs/new-expensify/hubs/get-paid-back/index.html → docs/new-expensify/hubs/payments/index.html

@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Get Paid Back
+title: Payments
 ---
 
 {% include hub.html %}

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.19</string>
+	<string>1.4.20</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.19.0</string>
+	<string>1.4.20.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.19</string>
+	<string>1.4.20</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.19.0</string>
+	<string>1.4.20.2</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.19-0",
+  "version": "1.4.20-2",
   "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.ts

@@ -594,6 +594,7 @@ const CONST = {
                     JOIN_ROOM: 'JOINROOM',
                 },
             },
+            THREAD_DISABLED: ['CREATED'],
         },
         ARCHIVE_REASON: {
             DEFAULT: 'default',

src/components/BlockingViews/BlockingView.js → src/components/BlockingViews/BlockingView.tsx

@@ -1,75 +1,75 @@
-import PropTypes from 'prop-types';
 import React from 'react';
-import {View} from 'react-native';
+import {ImageSourcePropType, View} from 'react-native';
+import {SvgProps} from 'react-native-svg';
 import AutoEmailLink from '@components/AutoEmailLink';
 import Icon from '@components/Icon';
-import sourcePropTypes from '@components/Image/sourcePropTypes';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import variables from '@styles/variables';
+import {TranslationPaths} from '@src/languages/types';
 
-const propTypes = {
+type BlockingViewProps = {
     /** Expensicon for the page */
-    icon: sourcePropTypes.isRequired,
+    icon: React.FC<SvgProps> | ImageSourcePropType;
 
     /** Color for the icon (should be from theme) */
-    iconColor: PropTypes.string,
+    iconColor?: string;
 
     /** Title message below the icon */
-    title: PropTypes.string.isRequired,
+    title: string;
 
     /** Subtitle message below the title */
-    subtitle: PropTypes.string,
+    subtitle?: string;
 
     /** Link message below the subtitle */
-    linkKey: PropTypes.string,
+    linkKey?: TranslationPaths;
 
     /** Whether we should show a link to navigate elsewhere */
-    shouldShowLink: PropTypes.bool,
+    shouldShowLink?: boolean;
 
     /** The custom icon width */
-    iconWidth: PropTypes.number,
+    iconWidth?: number;
 
     /** The custom icon height */
-    iconHeight: PropTypes.number,
+    iconHeight?: number;
 
     /** Function to call when pressing the navigation link */
-    onLinkPress: PropTypes.func,
+    onLinkPress?: () => void;
 
     /** Whether we should embed the link with subtitle */
-    shouldEmbedLinkWithSubtitle: PropTypes.bool,
+    shouldEmbedLinkWithSubtitle?: boolean;
 };
 
-const defaultProps = {
-    iconColor: null,
-    subtitle: '',
-    shouldShowLink: false,
-    linkKey: 'notFound.goBackHome',
-    iconWidth: variables.iconSizeSuperLarge,
-    iconHeight: variables.iconSizeSuperLarge,
-    onLinkPress: () => Navigation.dismissModal(),
-    shouldEmbedLinkWithSubtitle: false,
-};
-
-function BlockingView(props) {
+function BlockingView({
+    icon,
+    iconColor,
+    title,
+    subtitle = '',
+    linkKey = 'notFound.goBackHome',
+    shouldShowLink = false,
+    iconWidth = variables.iconSizeSuperLarge,
+    iconHeight = variables.iconSizeSuperLarge,
+    onLinkPress = () => Navigation.dismissModal(),
+    shouldEmbedLinkWithSubtitle = false,
+}: BlockingViewProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     function renderContent() {
         return (
             <>
                 <AutoEmailLink
                     style={[styles.textAlignCenter]}
-                    text={props.subtitle}
+                    text={subtitle}
                 />
-                {props.shouldShowLink ? (
+                {shouldShowLink ? (
                     <TextLink
-                        onPress={props.onLinkPress}
+                        onPress={onLinkPress}
                         style={[styles.link, styles.mt2]}
                     >
-                        {translate(props.linkKey)}
+                        {translate(linkKey)}
                     </TextLink>
                 ) : null}
             </>
@@ -79,14 +79,14 @@ function BlockingView(props) {
     return (
         <View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter, styles.ph10]}>
             <Icon
-                src={props.icon}
-                fill={props.iconColor}
-                width={props.iconWidth}
-                height={props.iconHeight}
+                src={icon}
+                fill={iconColor}
+                width={iconWidth}
+                height={iconHeight}
             />
-            <Text style={[styles.notFoundTextHeader]}>{props.title}</Text>
+            <Text style={[styles.notFoundTextHeader]}>{title}</Text>
 
-            {props.shouldEmbedLinkWithSubtitle ? (
+            {shouldEmbedLinkWithSubtitle ? (
                 <Text style={[styles.textAlignCenter]}>{renderContent()}</Text>
             ) : (
                 <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>{renderContent()}</View>
@@ -95,8 +95,6 @@ function BlockingView(props) {
     );
 }
 
-BlockingView.propTypes = propTypes;
-BlockingView.defaultProps = defaultProps;
 BlockingView.displayName = 'BlockingView';
 
 export default BlockingView;