Merge remote-tracking branch 'upstream/main' into perf/recalculate-changed-options

Author: TMisiukiewicz

.imgbotconfig

@@ -1,6 +1,6 @@
 {
     "ignoredFiles": [
-        "assets/images/themeDependent/empty-state_background-fade-dark.png", // Caused an issue with colour gradients, https://github.com/Expensify/App/issues/30499
+        "assets/images/themeDependent/empty-state_background-fade-dark.png", // Caused an issue with color gradients, https://github.com/Expensify/App/issues/30499
         "assets/images/themeDependent/empty-state_background-fade-light.png"
     ],
     "aggressiveCompression": "false"

Mobile-Expensify

@@ -561,7 +561,7 @@ If you'd like to add HybridApp-specific patches, use the `--patch-dir` flag:
 
 ### Additional information and troubleshooting
 
-If you seek some addtional information you can always refer to the [extended version](contributingGuides/HYBRID_APP.md) of the docs for HybridApp. You can find there extended explanation of some of the concepts, pro tips, and most common errors.
+If you seek some additional information you can always refer to the [extended version](contributingGuides/HYBRID_APP.md) of the docs for HybridApp. You can find there extended explanation of some of the concepts, pro tips, and most common errors.
 
 ----
 

README.md

@@ -48,7 +48,7 @@ const useFocusEffect = isJestEnv ? realReactNavigation.useFocusEffect : (callbac
 const UNSTABLE_usePreventRemove = isJestEnv ? jest.fn() : () => {};
 
 export {
-    // Overriden modules
+    // Overridden modules
     useIsFocused,
     useTheme,
     useNavigation,

__mocks__/@react-navigation/native/index.ts

@@ -46,7 +46,7 @@ const PinkBill = 'PinkBill';
 const CreditCardsNew = 'CreditCardsNew';
 const CreditCardsNewGreen = 'CreditCardsNewGreen';
 const InvoiceBlue = 'InvoiceBlue';
-const LaptopwithSecondScreenandHourglass = 'LaptopwithSecondScreenandHourglass';
+const LaptopWithSecondScreenAndHourglass = 'LaptopWithSecondScreenAndHourglass';
 const LockOpen = 'LockOpen';
 const Luggage = 'Luggage';
 const MoneyIntoWallet = 'MoneyIntoWallet';
@@ -200,7 +200,7 @@ export {
     CreditCardsNew,
     CreditCardsNewGreen,
     InvoiceBlue,
-    LaptopwithSecondScreenandHourglass,
+    LaptopWithSecondScreenAndHourglass,
     LockOpen,
     Luggage,
     MoneyIntoWallet,

__mocks__/Illustrations.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009013100
-        versionName "9.1.31-0"
+        versionCode 1009013102
+        versionName "9.1.31-2"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -105,7 +105,7 @@ protected NotificationCompat.Builder onExtendBuilder(@NonNull Context context, @
         PushMessage message = arguments.getMessage();
         Log.d(TAG, "buildNotification: " + message.toString());
 
-        // Improve notification delivery by categorising as a time-critical message
+        // Improve notification delivery by categorizing as a time-critical message
         builder.setCategory(CATEGORY_MESSAGE);
         builder.setVisibility(NotificationCompat.VISIBILITY_PRIVATE);
 

android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java

@@ -294,7 +294,7 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
 
     optimization: {
         minimizer: [
-            // default settings accordint to https://webpack.js.org/configuration/optimization/#optimizationminimizer
+            // default settings according to https://webpack.js.org/configuration/optimization/#optimizationminimizer
             // with addition of preserving the class name for ImageManipulator (expo module)
             new TerserPlugin({
                 terserOptions: {

…s/LaptopwithSecondScreenandHourglass.svg …top-with-second-screen-and-hourglass.svgassets/images/LaptopwithSecondScreenandHourglass.svg renamed to assets/images/laptop-with-second-screen-and-hourglass.svg assets/images/LaptopwithSecondScreenandHourglass.svg renamed to assets/images/laptop-with-second-screen-and-hourglass.svg

@@ -4,11 +4,11 @@
 
 - **GenericPressable**: A basic pressable component with generic functionality. It should generally only be used to creating a new, custom pressable components. Avoid using it directly.
 
-- **PressableWithFeedback**: A pressable component that provides standarised visual and haptic feedback upon pressing.
+- **PressableWithFeedback**: A pressable component that provides standardized visual and haptic feedback upon pressing.
 
 - **PressableWithoutFeedback**: A pressable component without any visual or haptic feedback.
 
-- **PressableWithoutFocus**: A pressable component without visible efect of focus.
+- **PressableWithoutFocus**: A pressable component without visible effect of focus.
 
 - **PressableWithDelayToggle**:  A pressable component that briefly disables then re-enables after a short delay upon pressing.
 
@@ -21,7 +21,7 @@ When implementing pressable components, it's essential to create accessible flow
 
 - size of any pressable component should be at least 44x44dp. This is the minimum size recommended by Apple and Google for touch targets. If the pressable component is smaller than `44x44dp`, it will be difficult for users with motor disabilities to interact with it. Pressable components have a `autoHitSlop` prop that can be used to automatically increase the size of the pressable component to `44x44dp`. This prop accepts a boolean value. If set to true, the pressable component will automatically increase its touchable size to `44x44dp`. If set to false, the pressable component will not increase its size. By default, this prop is set to false.
 
-- ensure that the pressable component has a label and hint. This is especially important for users with visual disabilities who rely on screen readers to navigate the app. All Pressable components have a `accessibilitylabel` prop that can be used to set the label of the pressable component. This prop accepts a string value. All Pressable components also have a `accessibilityHint` prop that can be used to set the hint of the pressable component. This prop accepts a string value. The `accessibilityHint` prop is optional. If not set, the pressable component will fallback to the `accessibilityLabel` prop. For example, if you have a button that opens a modal, you can set the `accessibilityLabel` to "Open modal" and the `accessibilityHint` to "Opens a modal with more information". This way, when the user focuses on the button, the screen reader will read "Open modal. Opens a modal with more information". This will help the user understand what the button does and what to expect after pressing it.
+- ensure that the pressable component has a label and hint. This is especially important for users with visual disabilities who rely on screen readers to navigate the app. All Pressable components have a `accessibilityLabel` prop that can be used to set the label of the pressable component. This prop accepts a string value. All Pressable components also have a `accessibilityHint` prop that can be used to set the hint of the pressable component. This prop accepts a string value. The `accessibilityHint` prop is optional. If not set, the pressable component will fallback to the `accessibilityLabel` prop. For example, if you have a button that opens a modal, you can set the `accessibilityLabel` to "Open modal" and the `accessibilityHint` to "Opens a modal with more information". This way, when the user focuses on the button, the screen reader will read "Open modal. Opens a modal with more information". This will help the user understand what the button does and what to expect after pressing it.
 
 - the `enableInScreenReaderStates` prop proves invaluable when aiming to enhance the accessibility of clickable elements, particularly when desiring to enlarge the clickable area of a component, such as an entire row. This can be especially useful, for instance, when dealing with tables where only a small portion of a row, like a checkbox, might traditionally trigger an action. By employing this prop, developers can ensure that the entirety of a designated component, in this case a row, is made accessible to users employing screen readers. This creates a more inclusive user experience, allowing individuals relying on screen readers to interact with the component effortlessly. For instance, in a table, using this prop on a row component enables users to click anywhere within the row to trigger an action, significantly improving accessibility and user-friendliness.