Merge remote-tracking branch 'origin/main' into fix/45303-note-join

Expensify · Jul 17, 2024 · 13a3243 · 13a3243
2 parents c3a1164 + a26d766
commit 13a3243
Show file tree

Hide file tree

Showing 14 changed files with 57 additions and 28 deletions.
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -10,6 +10,8 @@
 #     https://docs.fastlane.tools/plugins/available-plugins
 #
 
+require 'ostruct'
+
 skip_docs
 opt_out_usage
 

diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx
@@ -214,6 +214,10 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
                     pitchEnabled={pitchEnabled}
                     attributionPosition={{...styles.r2, ...styles.b2}}
                     scaleBarEnabled={false}
+                    // We use scaleBarPosition with top: -32 to hide the scale bar on iOS because scaleBarEnabled={false} not work on iOS
+                    scaleBarPosition={{...styles.tn8, left: 0}}
+                    compassEnabled
+                    compassPosition={{...styles.l2, ...styles.t5}}
                     logoPosition={{...styles.l2, ...styles.b2}}
                     // eslint-disable-next-line react/jsx-props-no-spreading
                     {...responder.panHandlers}

diff --git a/src/components/PopoverMenu.tsx b/src/components/PopoverMenu.tsx
@@ -158,12 +158,19 @@ function PopoverMenu({
                 onPress={() => {
                     setCurrentMenuItems(previousMenuItems);
                     setFocusedIndex(-1);
-                    setEnteredSubMenuIndexes(enteredSubMenuIndexes.slice(0, -1));
+                    setEnteredSubMenuIndexes((prevState) => prevState.slice(0, -1));
                 }}
             />
         );
     };
 
+    const renderHeaderText = () => {
+        if (!headerText || enteredSubMenuIndexes.length !== 0) {
+            return;
+        }
+        return <Text style={[styles.createMenuHeaderText, styles.ph5, styles.pv3]}>{headerText}</Text>;
+    };
+
     useKeyboardShortcut(
         CONST.KEYBOARD_SHORTCUTS.ENTER,
         () => {
@@ -215,7 +222,7 @@ function PopoverMenu({
         >
             <FocusTrapForModal active={isVisible}>
                 <View style={isSmallScreenWidth ? {} : styles.createMenuContainer}>
-                    {!!headerText && enteredSubMenuIndexes.length === 0 && <Text style={[styles.createMenuHeaderText, styles.ph5, styles.pv3]}>{headerText}</Text>}
+                    {renderHeaderText()}
                     {enteredSubMenuIndexes.length > 0 && renderBackButtonItem()}
                     {currentMenuItems.map((item, menuIndex) => (
                         <FocusableMenuItem

diff --git a/src/libs/DistanceRequestUtils.ts b/src/libs/DistanceRequestUtils.ts
@@ -80,9 +80,9 @@ function getDefaultMileageRate(policy: OnyxInputOrEntry<Policy>): MileageRate |
     if (!distanceUnit?.rates) {
         return;
     }
-    const mileageRates = getMileageRates(policy);
+    const mileageRates = Object.values(getMileageRates(policy));
 
-    const distanceRate = Object.values(mileageRates).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE) ?? Object.values(mileageRates)[0] ?? {};
+    const distanceRate = mileageRates.find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE) ?? mileageRates[0] ?? {};
 
     return {
         customUnitRateID: distanceRate.customUnitRateID,

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
@@ -666,7 +666,7 @@ function isActionableTrackExpense(reportAction: OnyxInputOrEntry<ReportAction>):
  */
 function isResolvedActionTrackExpense(reportAction: OnyxEntry<ReportAction>): boolean {
     const originalMessage = getOriginalMessage(reportAction);
-    const resolution = originalMessage && 'resolution' in originalMessage ? originalMessage?.resolution : null;
+    const resolution = originalMessage && typeof originalMessage === 'object' && 'resolution' in originalMessage ? originalMessage?.resolution : null;
     return isActionableTrackExpense(reportAction) && !!resolution;
 }
 

diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts
@@ -489,6 +489,7 @@ function deletePolicyDistanceRates(policyID: string, customUnit: CustomUnit, rat
         if (rateIDsToDelete.includes(rateID)) {
             optimisticRates[rateID] = {
                 ...currentRates[rateID],
+                enabled: false,
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
             };
             failureRates[rateID] = {

diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
@@ -57,6 +57,7 @@ import * as ReportConnection from '@libs/ReportConnection';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import type {PolicySelector} from '@pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover';
+import * as PersistedRequests from '@userActions/PersistedRequests';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {InvitedEmailsToAccountIDs, PersonalDetailsList, Policy, PolicyCategory, ReimbursementAccount, Report, ReportAction, TaxRatesWithDefault, Transaction} from '@src/types/onyx';
@@ -1069,6 +1070,25 @@ function updateGeneralSettings(policyID: string, name: string, currencyValue?: s
         currency,
     };
 
+    const persistedRequests = PersistedRequests.getAll();
+
+    persistedRequests.forEach((request, index) => {
+        const {command, data} = request;
+
+        if (command === WRITE_COMMANDS.CREATE_WORKSPACE && data?.policyID === policyID) {
+            if (data.policyName !== name) {
+                const createWorkspaceRequest = {
+                    ...request,
+                    data: {
+                        ...data,
+                        policyName: name,
+                    },
+                };
+                PersistedRequests.update(index, createWorkspaceRequest);
+            }
+        }
+    });
+
     API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_GENERAL_SETTINGS, params, {
         optimisticData,
         finallyData,

diff --git a/src/pages/home/report/ReportActionsList.tsx b/src/pages/home/report/ReportActionsList.tsx
@@ -688,7 +688,7 @@ function ReportActionsList({
                 isActive={(isFloatingMessageCounterVisible && !!currentUnreadMarker) || canScrollToNewerComments}
                 onClick={scrollToBottomAndMarkReportAsRead}
             />
-            <Animated.View style={[animatedStyles, styles.flex1, !shouldShowReportRecipientLocalTime && !hideComposer ? styles.pb4 : {}]}>
+            <Animated.View style={[animatedStyles, !shouldShowReportRecipientLocalTime && !hideComposer ? styles.pb4 : {}]}>
                 <InvertedFlatList
                     accessibilityLabel={translate('sidebarScreen.listOfChatMessages')}
                     ref={reportScrollManager.ref}

diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx
@@ -166,7 +166,10 @@ function IOURequestStartPage({
                                     {shouldDisplayDistanceRequest && <TopTab.Screen name={CONST.TAB_REQUEST.DISTANCE}>{() => <IOURequestStepDistance route={route} />}</TopTab.Screen>}
                                 </OnyxTabNavigator>
                             ) : (
-                                <IOURequestStepAmount route={route} />
+                                <IOURequestStepAmount
+                                    route={route}
+                                    shouldKeepUserInput
+                                />
                             )}
                         </View>
                     </DragAndDropProvider>

diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.tsx b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
@@ -22,7 +22,6 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
-import Parser from '@libs/Parser';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import updateMultilineInputRange from '@libs/updateMultilineInputRange';
 import type {SettingsNavigatorParamList} from '@navigation/types';
@@ -85,15 +84,13 @@ function WorkspaceInviteMessagePage({
         // policy?.description can be an empty string
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         policy?.description ||
-        Parser.replace(
-            translate('workspace.common.welcomeNote', {
-                workspaceName: policy?.name ?? '',
-            }),
-        );
+        translate('workspace.common.welcomeNote', {
+            workspaceName: policy?.name ?? '',
+        });
 
     useEffect(() => {
         if (!isEmptyObject(invitedEmailsToAccountIDsDraft)) {
-            setWelcomeNote(Parser.htmlToMarkdown(getDefaultWelcomeNote()));
+            setWelcomeNote(getDefaultWelcomeNote());
             return;
         }
         Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID), true);

diff --git a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx
@@ -118,7 +118,7 @@ function SageIntacctAdvancedPage({policy}: WithPolicyProps) {
                     switchAccessibilityLabel={section.label}
                     isActive={section.isActive}
                     onToggle={section.onToggle}
-                    wrapperStyle={[styles.ph5, styles.pb3]}
+                    wrapperStyle={[styles.ph5, styles.pv3]}
                     pendingAction={section.pendingAction}
                     errors={section.error}
                     onCloseError={section.onCloseError}

diff --git a/src/styles/index.ts b/src/styles/index.ts
@@ -2108,7 +2108,8 @@ const styles = (theme: ThemeColors) =>
         },
 
         chatFooterFullCompose: {
-            flex: 1,
+            height: '100%',
+            paddingTop: 20,
         },
 
         chatItemDraft: {

diff --git a/src/styles/utils/positioning.ts b/src/styles/utils/positioning.ts
@@ -22,6 +22,9 @@ export default {
     t0: {
         top: 0,
     },
+    t5: {
+        top: 20,
+    },
     tn4: {
         top: -16,
     },

diff --git a/web/index.html b/web/index.html
@@ -81,18 +81,9 @@
             transition: transform var(--label-transition-duration);
         }
 
-        @media screen and (min-width: 480px) {
-            .splash-logo > svg {
-                width: 104px;
-                height: 104px;
-            }
-        }
-
-        @media screen and (max-width: 479px) {
-            .splash-logo > svg {
-                width: 52px;
-                height: 52px;
-            }
+        .splash-logo > svg {
+            width: 104px;
+            height: 104px;
         }
 
         #splash {
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,9 @@ export default { @@
         t0: {
             top: 0,
         },
+        t5: {
+            top: 20,
+        },
         tn4: {
             top: -16,
         },
@@ Expand Down @@