Merge branch 'main' into refactor/remove-isNotEmptyObject

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001042700
-        versionName "1.4.27-0"
+        versionCode 1001042701
+        versionName "1.4.27-1"
     }
 
     flavorDimensions "default"

docs/articles/expensify-classic/expensify-card/Auto-Reconciliation.md

@@ -65,7 +65,7 @@ Once Auto-Reconciliation is enabled, there are a few things that happen. Let’s
 ### How This Works
 1. On the day of your first card settlement, we'll create the Expensify Card Liability account in your QuickBooks Online general ledger. If you've opted for Daily Settlement, we'll also create an Expensify Clearing Account.
 2. During your QuickBooks Online auto-sync on that same day, if there are unsettled transactions, we'll generate a journal entry totaling all posted transactions since the last settlement. This entry will credit the selected bank account and debit the new Expensify Clearing Account (for Daily Settlement) or the Expensify Liability Account (for Monthly Settlement).
-3. Once the transactions are posted and the expense report is approved in Expensify, the report will be exported to QuickBooks Online with each line as individual credit card expenses. For Daily Settlement, an additional journal entry will credit the Expensify Clearing Account and debit the Expensify Card Liability Account. For Monthly Settlement, the journal entry will credit the Liability account directly and debit the appropriate expense categories.
+3. Once the transactions are posted and the expense report is approved in Expensify, the report will be exported to QuickBooks Online with each line as individual card expenses. For Daily Settlement, an additional journal entry will credit the Expensify Clearing Account and debit the Expensify Card Liability Account. For Monthly Settlement, the journal entry will credit the Liability account directly and debit the appropriate expense categories.
 
 ### Example
 - We have card transactions for the day totaling $100, so we create the following journal entry upon sync:

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.27.0</string>
+	<string>1.4.27.1</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.4.27.0</string>
+	<string>1.4.27.1</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.27</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.27.0</string>
+	<string>1.4.27.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package.json

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

@@ -1290,10 +1290,15 @@ const CONST = {
             TRIP: 'trip',
             MANUAL: 'manual',
         },
+        AUTO_REPORTING_OFFSET: {
+            LAST_BUSINESS_DAY_OF_MONTH: 'lastBusinessDayOfMonth',
+            LAST_DAY_OF_MONTH: 'lastDayOfMonth',
+        },
         ROOM_PREFIX: '#',
         CUSTOM_UNIT_RATE_BASE_OFFSET: 100,
         OWNER_EMAIL_FAKE: '_FAKE_',
         OWNER_ACCOUNT_ID_FAKE: 0,
+        ID_FAKE: '_FAKE_',
     },
 
     CUSTOM_UNITS: {

src/components/ReportActionItem/TaskPreview.tsx

@@ -34,7 +34,7 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 type PolicyRole = {
     /** The role of current user */
-    role: string;
+    role: Task.PolicyValue | undefined;
 };
 
 type TaskPreviewOnyxProps = {
@@ -94,7 +94,7 @@ function TaskPreview({
         ? taskReport?.stateNum === CONST.REPORT.STATE_NUM.APPROVED && taskReport.statusNum === CONST.REPORT.STATUS_NUM.APPROVED
         : action?.childStateNum === CONST.REPORT.STATE_NUM.APPROVED && action?.childStatusNum === CONST.REPORT.STATUS_NUM.APPROVED;
     const taskTitle = Str.htmlEncode(TaskUtils.getTaskTitle(taskReportID, action?.childReportName ?? ''));
-    const taskAssigneeAccountID = Task.getTaskAssigneeAccountID(taskReport ?? {}) ?? action?.childManagerAccountID ?? '';
+    const taskAssigneeAccountID = Task.getTaskAssigneeAccountID(taskReport) ?? action?.childManagerAccountID ?? '';
     const assigneeLogin = personalDetails[taskAssigneeAccountID]?.login ?? '';
     const assigneeDisplayName = personalDetails[taskAssigneeAccountID]?.displayName ?? '';
     const taskAssignee = assigneeDisplayName || LocalePhoneNumber.formatPhoneNumber(assigneeLogin);
@@ -124,12 +124,12 @@ function TaskPreview({
                         style={[styles.mr2]}
                         containerStyle={[styles.taskCheckbox]}
                         isChecked={isTaskCompleted}
-                        disabled={!Task.canModifyTask(taskReport ?? {}, currentUserPersonalDetails.accountID, rootParentReportpolicy?.role ?? '')}
+                        disabled={!Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID, rootParentReportpolicy?.role)}
                         onPress={Session.checkIfActionIsAllowed(() => {
                             if (isTaskCompleted) {
-                                Task.reopenTask(taskReport ?? {});
+                                Task.reopenTask(taskReport);
                             } else {
-                                Task.completeTask(taskReport ?? {});
+                                Task.completeTask(taskReport);
                             }
                         })}
                         accessibilityLabel={translate('task.task')}
@@ -154,7 +154,7 @@ export default withCurrentUserPersonalDetails(
         },
         rootParentReportpolicy: {
             key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID ?? '0'}`,
-            selector: (policy: Policy | null) => ({role: policy?.role ?? ''}),
+            selector: (policy: Policy | null) => ({role: policy?.role}),
         },
     })(TaskPreview),
 );

src/components/SectionList/index.android.tsx

@@ -1,22 +1,19 @@
 import React, {forwardRef} from 'react';
-import type {ForwardedRef} from 'react';
 import {SectionList as RNSectionList} from 'react-native';
-import type {SectionListProps} from 'react-native';
+import type ForwardedSectionList from './types';
 
 // eslint-disable-next-line react/function-component-definition
-function SectionListWithRef<ItemT, SectionT>(props: SectionListProps<ItemT, SectionT>, ref: ForwardedRef<RNSectionList<ItemT, SectionT>>) {
-    return (
-        <RNSectionList
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-            ref={ref}
-            // For Android we want to use removeClippedSubviews since it helps manage memory consumption. When we
-            // run out memory images stop loading and appear as grey circles
-            // eslint-disable-next-line react/jsx-props-no-multi-spaces
-            removeClippedSubviews
-        />
-    );
-}
+const SectionListWithRef: ForwardedSectionList = (props, ref) => (
+    <RNSectionList
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        ref={ref}
+        // For Android we want to use removeClippedSubviews since it helps manage memory consumption. When we
+        // run out memory images stop loading and appear as grey circles
+        // eslint-disable-next-line react/jsx-props-no-multi-spaces
+        removeClippedSubviews
+    />
+);
 
 SectionListWithRef.displayName = 'SectionListWithRef';
 

src/components/SectionList/index.tsx

@@ -1,17 +1,16 @@
 import React, {forwardRef} from 'react';
-import type {ForwardedRef} from 'react';
 import {SectionList as RNSectionList} from 'react-native';
-import type {SectionListProps} from 'react-native';
+import type ForwardedSectionList from './types';
 
 // eslint-disable-next-line react/function-component-definition
-function SectionList<ItemT, SectionT>(props: SectionListProps<ItemT, SectionT>, ref: ForwardedRef<RNSectionList<ItemT, SectionT>>) {
-    return (
-        <RNSectionList
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-            ref={ref}
-        />
-    );
-}
+const SectionList: ForwardedSectionList = (props, ref) => (
+    <RNSectionList
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        ref={ref}
+    />
+);
+
+SectionList.displayName = 'SectionList';
 
 export default forwardRef(SectionList);

src/components/SectionList/types.ts

@@ -0,0 +1,9 @@
+import type {ForwardedRef} from 'react';
+import type {SectionList, SectionListProps} from 'react-native';
+
+type ForwardedSectionList = {
+    (props: SectionListProps<SectionList>, ref: ForwardedRef<SectionList>): React.ReactNode;
+    displayName: string;
+};
+
+export default ForwardedSectionList;

src/components/SelectionList/BaseListItem.tsx → src/components/SelectionList/BaseListItem.js

@@ -1,3 +1,4 @@
+import lodashGet from 'lodash/get';
 import React from 'react';
 import {View} from 'react-native';
 import Icon from '@components/Icon';
@@ -11,10 +12,10 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
 import RadioListItem from './RadioListItem';
-import type {BaseListItemProps, RadioItem, User} from './types';
+import {baseListItemPropTypes} from './selectionListPropTypes';
 import UserListItem from './UserListItem';
 
-function BaseListItem<TItem extends User | RadioItem>({
+function BaseListItem({
     item,
     isFocused = false,
     isDisabled = false,
@@ -25,12 +26,13 @@ function BaseListItem<TItem extends User | RadioItem>({
     onDismissError = () => {},
     rightHandSideComponent,
     keyForList,
-}: BaseListItemProps<TItem>) {
+}) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-    const isRadioItem = item.rightElement === undefined;
+    const isUserItem = lodashGet(item, 'icons.length', 0) > 0;
+    const ListItem = isUserItem ? UserListItem : RadioListItem;
 
     const rightHandSideComponentRender = () => {
         if (canSelectMultiple || !rightHandSideComponent) {
@@ -68,7 +70,7 @@ function BaseListItem<TItem extends User | RadioItem>({
                         styles.justifyContentBetween,
                         styles.sidebarLinkInner,
                         styles.userSelectNone,
-                        isRadioItem ? styles.optionRow : styles.peopleRow,
+                        isUserItem ? styles.peopleRow : styles.optionRow,
                         isFocused && styles.sidebarLinkActive,
                     ]}
                 >
@@ -98,32 +100,20 @@ function BaseListItem<TItem extends User | RadioItem>({
                             </View>
                         </View>
                     )}
-
-                    {isRadioItem ? (
-                        <RadioListItem
-                            item={item}
-                            textStyles={[styles.optionDisplayName, isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.pre, item.alternateText ? styles.mb1 : null]}
-                            alternateTextStyles={[styles.textLabelSupporting, styles.lh16, styles.pre]}
-                            isDisabled={isDisabled}
-                            onSelectRow={() => onSelectRow(item)}
-                            showTooltip={showTooltip}
-                        />
-                    ) : (
-                        <UserListItem
-                            item={item}
-                            textStyles={[
-                                styles.optionDisplayName,
-                                isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText,
-                                styles.sidebarLinkTextBold,
-                                styles.pre,
-                                item.alternateText ? styles.mb1 : null,
-                            ]}
-                            alternateTextStyles={[styles.textLabelSupporting, styles.lh16, styles.pre]}
-                            isDisabled={isDisabled}
-                            onSelectRow={() => onSelectRow(item)}
-                            showTooltip={showTooltip}
-                        />
-                    )}
+                    <ListItem
+                        item={item}
+                        textStyles={[
+                            styles.optionDisplayName,
+                            isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText,
+                            styles.sidebarLinkTextBold,
+                            styles.pre,
+                            item.alternateText ? styles.mb1 : null,
+                        ]}
+                        alternateTextStyles={[styles.textLabelSupporting, styles.lh16, styles.pre]}
+                        isDisabled={isDisabled}
+                        onSelectRow={onSelectRow}
+                        showTooltip={showTooltip}
+                    />
                     {!canSelectMultiple && item.isSelected && !rightHandSideComponent && (
                         <View
                             style={[styles.flexRow, styles.alignItemsCenter, styles.ml3]}
@@ -139,7 +129,7 @@ function BaseListItem<TItem extends User | RadioItem>({
                     )}
                     {rightHandSideComponentRender()}
                 </View>
-                {!!item.invitedSecondaryLogin && (
+                {Boolean(item.invitedSecondaryLogin) && (
                     <Text style={[styles.ml9, styles.ph5, styles.pb3, styles.textLabelSupporting]}>
                         {translate('workspace.people.invitedBySecondaryLogin', {secondaryLogin: item.invitedSecondaryLogin})}
                     </Text>
@@ -150,5 +140,6 @@ function BaseListItem<TItem extends User | RadioItem>({
 }
 
 BaseListItem.displayName = 'BaseListItem';
+BaseListItem.propTypes = baseListItemPropTypes;
 
 export default BaseListItem;