From 8abd4be00bf0a593caa8ef1edc5c601638885394 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Thu, 13 Jun 2024 03:55:19 +0100 Subject: [PATCH 01/30] change popover border radius to 16px --- src/styles/utils/generators/ModalStyleUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/utils/generators/ModalStyleUtils.ts b/src/styles/utils/generators/ModalStyleUtils.ts index bc668ba45670..b7998f6d721e 100644 --- a/src/styles/utils/generators/ModalStyleUtils.ts +++ b/src/styles/utils/generators/ModalStyleUtils.ts @@ -197,7 +197,7 @@ const createModalStyleUtils: StyleUtilGenerator = ({the }, }; modalContainerStyle = { - borderRadius: 12, + borderRadius: variables.componentBorderRadiusLarge, borderWidth: 1, borderColor: theme.border, justifyContent: 'center', From 74f3c7d04f78101bdec91f331f1364bd2a925be3 Mon Sep 17 00:00:00 2001 From: truph01 Date: Thu, 13 Jun 2024 11:30:21 +0700 Subject: [PATCH 02/30] Fix: Your location button button is displayed on distance request thumbnail --- src/components/MapView/MapView.tsx | 112 ++++++++++++--------- src/components/MapView/MapView.website.tsx | 82 +++++++++------ 2 files changed, 119 insertions(+), 75 deletions(-) diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx index 8168cef99cd3..c88f73b7eb4e 100644 --- a/src/components/MapView/MapView.tsx +++ b/src/components/MapView/MapView.tsx @@ -170,7 +170,28 @@ const MapView = forwardRef( }, [directionCoordinates, currentPosition, mapPadding, waypoints]); const centerCoordinate = currentPosition ? [currentPosition.longitude, currentPosition.latitude] : initialState?.location; - return !isOffline && !!accessToken && !!currentPosition ? ( + const defaultSettings: Mapbox.CameraStop | undefined = useMemo(() => { + if (!interactive) { + if (!waypoints) { + return undefined; + } + const {northEast, southWest} = utils.getBounds( + waypoints.map((waypoint) => waypoint.coordinate), + directionCoordinates, + ); + return { + zoomLevel: initialState?.zoom, + bounds: {ne: northEast, sw: southWest}, + }; + } else { + return { + centerCoordinate, + zoomLevel: initialState?.zoom, + }; + } + }, [waypoints, directionCoordinates, interactive]); + + return !isOffline && !!accessToken && !!defaultSettings ? ( ( > - - - + > + + + )} {waypoints?.map(({coordinate, markerComponent, id}) => { const MarkerComponent = markerComponent; - if (utils.areSameCoordinate([coordinate[0], coordinate[1]], [currentPosition?.longitude ?? 0, currentPosition?.latitude ?? 0])) { + if (utils.areSameCoordinate([coordinate[0], coordinate[1]], [currentPosition?.longitude ?? 0, currentPosition?.latitude ?? 0]) && interactive) { return null; } return ( @@ -238,22 +258,24 @@ const MapView = forwardRef( {directionCoordinates && } - - - - - - - + {interactive && ( + + + + + + + + )} ) : ( ( }); }, [directionCoordinates, currentPosition, mapRef, waypoints, mapPadding]); - return !isOffline && !!accessToken && !!currentPosition ? ( + const initialViewState = useMemo(() => { + if (!interactive) { + if (!waypoints) { + return undefined; + } + const {northEast, southWest} = utils.getBounds( + waypoints.map((waypoint) => waypoint.coordinate), + directionCoordinates, + ); + return { + zoom: initialState.zoom, + bounds: [northEast, southWest], + }; + } else { + return { + longitude: currentPosition?.longitude, + latitude: currentPosition?.latitude, + zoom: initialState.zoom, + }; + } + }, [waypoints, directionCoordinates, interactive]); + + return !isOffline && !!accessToken && !!initialViewState ? ( ( ref={setRef} mapLib={mapboxgl} mapboxAccessToken={accessToken} - initialViewState={{ - longitude: currentPosition?.longitude, - latitude: currentPosition?.latitude, - zoom: initialState.zoom, - }} + initialViewState={initialViewState} style={StyleUtils.getTextColorStyle(theme.mapAttributionText)} mapStyle={styleURL} interactive={interactive} > - - - + {interactive && ( + + + + )} {waypoints?.map(({coordinate, markerComponent, id}) => { const MarkerComponent = markerComponent; - if (utils.areSameCoordinate([coordinate[0], coordinate[1]], [currentPosition?.longitude ?? 0, currentPosition?.latitude ?? 0])) { + if (utils.areSameCoordinate([coordinate[0], coordinate[1]], [currentPosition?.longitude ?? 0, currentPosition?.latitude ?? 0]) && interactive) { return null; } return ( @@ -252,22 +272,24 @@ const MapView = forwardRef( })} {directionCoordinates && } - - - - - - - + {interactive && ( + + + + + + + + )} ) : ( Date: Thu, 13 Jun 2024 15:03:40 +0700 Subject: [PATCH 03/30] Fix: native issue --- src/components/MapView/MapView.tsx | 36 ++++++++++++++-------- src/components/MapView/MapView.website.tsx | 2 +- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx index c88f73b7eb4e..93c9f671edb8 100644 --- a/src/components/MapView/MapView.tsx +++ b/src/components/MapView/MapView.tsx @@ -170,26 +170,35 @@ const MapView = forwardRef( }, [directionCoordinates, currentPosition, mapPadding, waypoints]); const centerCoordinate = currentPosition ? [currentPosition.longitude, currentPosition.latitude] : initialState?.location; + + const initialBounds = useMemo(() => { + if (!waypoints) { + return undefined; + } + const {northEast, southWest} = utils.getBounds( + waypoints.map((waypoint) => waypoint.coordinate), + directionCoordinates, + ); + return {ne: northEast, sw: southWest}; + }, [waypoints, directionCoordinates]); + const defaultSettings: Mapbox.CameraStop | undefined = useMemo(() => { - if (!interactive) { - if (!waypoints) { + if (interactive) { + if (!centerCoordinate) { return undefined; } - const {northEast, southWest} = utils.getBounds( - waypoints.map((waypoint) => waypoint.coordinate), - directionCoordinates, - ); return { zoomLevel: initialState?.zoom, - bounds: {ne: northEast, sw: southWest}, - }; - } else { - return { centerCoordinate, - zoomLevel: initialState?.zoom, }; } - }, [waypoints, directionCoordinates, interactive]); + if (!initialBounds) { + return undefined; + } + return { + bounds: initialBounds, + }; + }, [interactive, centerCoordinate, initialBounds, initialState?.zoom]); return !isOffline && !!accessToken && !!defaultSettings ? ( @@ -210,7 +219,8 @@ const MapView = forwardRef( defaultSettings={defaultSettings} // Include centerCoordinate here as well to address the issue of incorrect coordinates // displayed after the first render when the app's storage is cleared. - centerCoordinate={centerCoordinate} + centerCoordinate={interactive ? centerCoordinate : undefined} + bounds={interactive ? undefined : initialBounds} /> {interactive && ( ( zoom: initialState.zoom, }; } - }, [waypoints, directionCoordinates, interactive]); + }, [waypoints, directionCoordinates, interactive, currentPosition, initialState.zoom]); return !isOffline && !!accessToken && !!initialViewState ? ( Date: Thu, 13 Jun 2024 15:06:02 +0700 Subject: [PATCH 04/30] fix lint --- src/components/MapView/MapView.website.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MapView/MapView.website.tsx b/src/components/MapView/MapView.website.tsx index ef75c7d28003..d7575aa16a0a 100644 --- a/src/components/MapView/MapView.website.tsx +++ b/src/components/MapView/MapView.website.tsx @@ -6,7 +6,7 @@ import {useFocusEffect} from '@react-navigation/native'; import mapboxgl from 'mapbox-gl'; import 'mapbox-gl/dist/mapbox-gl.css'; import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react'; -import type {MapRef} from 'react-map-gl'; +import type {MapRef, ViewState} from 'react-map-gl'; import Map, {Marker} from 'react-map-gl'; import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; @@ -208,7 +208,7 @@ const MapView = forwardRef( }); }, [directionCoordinates, currentPosition, mapRef, waypoints, mapPadding]); - const initialViewState = useMemo(() => { + const initialViewState: Partial = useMemo(() => { if (!interactive) { if (!waypoints) { return undefined; From a9b70a5d9e706c4ace3ca0f106531e6643d9b7e2 Mon Sep 17 00:00:00 2001 From: truph01 Date: Thu, 13 Jun 2024 15:22:00 +0700 Subject: [PATCH 05/30] Fix: Lint --- src/components/MapView/MapView.tsx | 2 +- src/components/MapView/MapView.website.tsx | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx index 93c9f671edb8..a9f2fe439fcd 100644 --- a/src/components/MapView/MapView.tsx +++ b/src/components/MapView/MapView.tsx @@ -169,7 +169,7 @@ const MapView = forwardRef( }); }, [directionCoordinates, currentPosition, mapPadding, waypoints]); - const centerCoordinate = currentPosition ? [currentPosition.longitude, currentPosition.latitude] : initialState?.location; + const centerCoordinate = useMemo(() => (currentPosition ? [currentPosition.longitude, currentPosition.latitude] : initialState?.location), [currentPosition, initialState?.location]); const initialBounds = useMemo(() => { if (!waypoints) { diff --git a/src/components/MapView/MapView.website.tsx b/src/components/MapView/MapView.website.tsx index d7575aa16a0a..f5c64f47409c 100644 --- a/src/components/MapView/MapView.website.tsx +++ b/src/components/MapView/MapView.website.tsx @@ -208,7 +208,7 @@ const MapView = forwardRef( }); }, [directionCoordinates, currentPosition, mapRef, waypoints, mapPadding]); - const initialViewState: Partial = useMemo(() => { + const initialViewState: Partial | undefined = useMemo(() => { if (!interactive) { if (!waypoints) { return undefined; @@ -221,13 +221,12 @@ const MapView = forwardRef( zoom: initialState.zoom, bounds: [northEast, southWest], }; - } else { - return { - longitude: currentPosition?.longitude, - latitude: currentPosition?.latitude, - zoom: initialState.zoom, - }; } + return { + longitude: currentPosition?.longitude, + latitude: currentPosition?.latitude, + zoom: initialState.zoom, + }; }, [waypoints, directionCoordinates, interactive, currentPosition, initialState.zoom]); return !isOffline && !!accessToken && !!initialViewState ? ( From eaabe9667cda117a6cae78c8a4bad6fe9b0308b5 Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Thu, 13 Jun 2024 22:55:35 +0100 Subject: [PATCH 06/30] Change modal border radius to 16px --- src/styles/index.ts | 2 +- src/styles/utils/generators/ModalStyleUtils.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/styles/index.ts b/src/styles/index.ts index f2de312bd289..5e04216b3431 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -1700,7 +1700,7 @@ const styles = (theme: ThemeColors) => createMenuContainer: { width: variables.sideBarWidth - 40, - paddingVertical: 12, + paddingVertical: 16, }, createMenuHeaderText: { diff --git a/src/styles/utils/generators/ModalStyleUtils.ts b/src/styles/utils/generators/ModalStyleUtils.ts index b7998f6d721e..fdd6411da783 100644 --- a/src/styles/utils/generators/ModalStyleUtils.ts +++ b/src/styles/utils/generators/ModalStyleUtils.ts @@ -75,7 +75,7 @@ const createModalStyleUtils: StyleUtilGenerator = ({the }; modalContainerStyle = { boxShadow: '0px 0px 5px 5px rgba(0, 0, 0, 0.1)', - borderRadius: 12, + borderRadius: variables.componentBorderRadiusLarge, overflow: 'hidden', width: variables.sideBarWidth, }; @@ -102,7 +102,7 @@ const createModalStyleUtils: StyleUtilGenerator = ({the flex: 1, marginTop: isSmallScreenWidth ? 0 : 20, marginBottom: isSmallScreenWidth ? 0 : 20, - borderRadius: isSmallScreenWidth ? 0 : 12, + borderRadius: isSmallScreenWidth ? 0 : variables.componentBorderRadiusLarge, overflow: 'hidden', ...getCenteredModalStyles(styles, windowWidth, isSmallScreenWidth), }; @@ -129,7 +129,7 @@ const createModalStyleUtils: StyleUtilGenerator = ({the flex: 1, marginTop: isSmallScreenWidth ? 0 : 20, marginBottom: isSmallScreenWidth ? 0 : 20, - borderRadius: isSmallScreenWidth ? 0 : 12, + borderRadius: isSmallScreenWidth ? 0 : variables.componentBorderRadiusLarge, overflow: 'hidden', ...getCenteredModalStyles(styles, windowWidth, isSmallScreenWidth, true), }; @@ -151,7 +151,7 @@ const createModalStyleUtils: StyleUtilGenerator = ({the }; modalContainerStyle = { boxShadow: '0px 0px 5px 5px rgba(0, 0, 0, 0.1)', - borderRadius: 12, + borderRadius: variables.componentBorderRadiusLarge, borderWidth: 0, }; From d0bcc2be0828f26febb41e19ed5f48980a941973 Mon Sep 17 00:00:00 2001 From: truph01 Date: Fri, 14 Jun 2024 18:07:57 +0700 Subject: [PATCH 07/30] Fix: Create initCenterCoordinate and initBounds --- src/components/MapView/MapView.tsx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx index a9f2fe439fcd..4f2a619ea644 100644 --- a/src/components/MapView/MapView.tsx +++ b/src/components/MapView/MapView.tsx @@ -171,7 +171,7 @@ const MapView = forwardRef( const centerCoordinate = useMemo(() => (currentPosition ? [currentPosition.longitude, currentPosition.latitude] : initialState?.location), [currentPosition, initialState?.location]); - const initialBounds = useMemo(() => { + const waypointsBounds = useMemo(() => { if (!waypoints) { return undefined; } @@ -192,13 +192,16 @@ const MapView = forwardRef( centerCoordinate, }; } - if (!initialBounds) { + if (!waypointsBounds) { return undefined; } return { - bounds: initialBounds, + bounds: waypointsBounds, }; - }, [interactive, centerCoordinate, initialBounds, initialState?.zoom]); + }, [interactive, centerCoordinate, waypointsBounds, initialState?.zoom]); + + const initCenterCoordinate = useMemo(() => (interactive ? centerCoordinate : undefined), [interactive, centerCoordinate]); + const initBounds = useMemo(() => (interactive ? undefined : waypointsBounds), [interactive, waypointsBounds]); return !isOffline && !!accessToken && !!defaultSettings ? ( @@ -219,8 +222,8 @@ const MapView = forwardRef( defaultSettings={defaultSettings} // Include centerCoordinate here as well to address the issue of incorrect coordinates // displayed after the first render when the app's storage is cleared. - centerCoordinate={interactive ? centerCoordinate : undefined} - bounds={interactive ? undefined : initialBounds} + centerCoordinate={initCenterCoordinate} + bounds={initBounds} /> {interactive && ( Date: Fri, 14 Jun 2024 19:18:14 +0100 Subject: [PATCH 08/30] Change bottom docked modal border radius and padding --- src/styles/utils/generators/ModalStyleUtils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/utils/generators/ModalStyleUtils.ts b/src/styles/utils/generators/ModalStyleUtils.ts index fdd6411da783..1606c6dfe331 100644 --- a/src/styles/utils/generators/ModalStyleUtils.ts +++ b/src/styles/utils/generators/ModalStyleUtils.ts @@ -174,9 +174,9 @@ const createModalStyleUtils: StyleUtilGenerator = ({the }; modalContainerStyle = { width: '100%', - borderTopLeftRadius: 20, - borderTopRightRadius: 20, - paddingTop: 12, + borderTopLeftRadius: variables.componentBorderRadiusLarge, + borderTopRightRadius: variables.componentBorderRadiusLarge, + paddingTop: 16, justifyContent: 'center', overflow: 'hidden', }; From 84c13eaec4bd9fcb9b9350fc39937a96dd3387ed Mon Sep 17 00:00:00 2001 From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com> Date: Fri, 14 Jun 2024 19:32:29 +0100 Subject: [PATCH 09/30] Update vertical padding for report action context menu --- .../utils/generators/ReportActionContextMenuStyleUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/utils/generators/ReportActionContextMenuStyleUtils.ts b/src/styles/utils/generators/ReportActionContextMenuStyleUtils.ts index e8761468f640..b3f3a816d09a 100644 --- a/src/styles/utils/generators/ReportActionContextMenuStyleUtils.ts +++ b/src/styles/utils/generators/ReportActionContextMenuStyleUtils.ts @@ -45,7 +45,7 @@ const createReportActionContextMenuStyleUtils: StyleUtilGenerator Date: Sat, 15 Jun 2024 15:55:58 +0100 Subject: [PATCH 10/30] use variables.componentBorderRadiusLarge as variable for padding --- src/styles/index.ts | 2 +- src/styles/utils/generators/ModalStyleUtils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/index.ts b/src/styles/index.ts index 5e04216b3431..c2935f512f2f 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -1700,7 +1700,7 @@ const styles = (theme: ThemeColors) => createMenuContainer: { width: variables.sideBarWidth - 40, - paddingVertical: 16, + paddingVertical: variables.componentBorderRadiusLarge, }, createMenuHeaderText: { diff --git a/src/styles/utils/generators/ModalStyleUtils.ts b/src/styles/utils/generators/ModalStyleUtils.ts index 1606c6dfe331..7f51b7727d6a 100644 --- a/src/styles/utils/generators/ModalStyleUtils.ts +++ b/src/styles/utils/generators/ModalStyleUtils.ts @@ -176,7 +176,7 @@ const createModalStyleUtils: StyleUtilGenerator = ({the width: '100%', borderTopLeftRadius: variables.componentBorderRadiusLarge, borderTopRightRadius: variables.componentBorderRadiusLarge, - paddingTop: 16, + paddingTop: variables.componentBorderRadiusLarge, justifyContent: 'center', overflow: 'hidden', }; From b1d9d9e6685a8fbc8d92209cecc7d95a4ea2b4a9 Mon Sep 17 00:00:00 2001 From: Sheena Trepanier Date: Mon, 17 Jun 2024 17:24:46 -0700 Subject: [PATCH 11/30] Moving an article to the Hidden category so it's not public any longer --- .../expenses => Hidden}/Manually-submit-reports-for-approval.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/{articles/new-expensify/expenses => Hidden}/Manually-submit-reports-for-approval.md (100%) diff --git a/docs/articles/new-expensify/expenses/Manually-submit-reports-for-approval.md b/docs/Hidden/Manually-submit-reports-for-approval.md similarity index 100% rename from docs/articles/new-expensify/expenses/Manually-submit-reports-for-approval.md rename to docs/Hidden/Manually-submit-reports-for-approval.md From b3ee9c62c5b62f144d30f6508eb2cf51607a0f9b Mon Sep 17 00:00:00 2001 From: Wojciech Boman Date: Wed, 19 Jun 2024 14:43:07 +0200 Subject: [PATCH 12/30] Add isReportInRhpOpened --- src/libs/Navigation/linkTo/index.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts index 6cec46eae144..458137f4cbb3 100644 --- a/src/libs/Navigation/linkTo/index.ts +++ b/src/libs/Navigation/linkTo/index.ts @@ -21,7 +21,7 @@ import getAdaptedStateFromPath from '@navigation/linkingConfig/getAdaptedStateFr import getMatchingBottomTabRouteForState from '@navigation/linkingConfig/getMatchingBottomTabRouteForState'; import getMatchingCentralPaneRouteForState from '@navigation/linkingConfig/getMatchingCentralPaneRouteForState'; import replacePathInNestedState from '@navigation/linkingConfig/replacePathInNestedState'; -import type {NavigationRoot, RootStackParamList, StackNavigationAction, State} from '@navigation/types'; +import type {NavigationPartialRoute, NavigationRoot, RootStackParamList, StackNavigationAction, State} from '@navigation/types'; import CONST from '@src/CONST'; import NAVIGATORS from '@src/NAVIGATORS'; import type {Route} from '@src/ROUTES'; @@ -51,10 +51,11 @@ export default function linkTo(navigation: NavigationContainerRef)?.policyID ?? '') !== ((matchingBottomTabRoute?.params as Record)?.policyID ?? ''); + const isReportInRhpOpened = + lastRoute?.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR && lastRoute?.state?.routes?.includes((route: NavigationPartialRoute) => route?.name === SCREENS.SEARCH.REPORT_RHP); if (topmostBottomTabRoute && (topmostBottomTabRoute.name !== matchingBottomTabRoute.name || isNewPolicyID || isOpeningSearch)) { root.dispatch({ @@ -98,7 +101,8 @@ export default function linkTo(navigation: NavigationContainerRef Date: Wed, 19 Jun 2024 14:48:27 +0200 Subject: [PATCH 13/30] Refactor docs --- src/libs/Navigation/linkTo/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts index 458137f4cbb3..b1f45e6b32f4 100644 --- a/src/libs/Navigation/linkTo/index.ts +++ b/src/libs/Navigation/linkTo/index.ts @@ -101,7 +101,7 @@ export default function linkTo(navigation: NavigationContainerRef Date: Wed, 19 Jun 2024 15:02:29 +0200 Subject: [PATCH 14/30] fix: do not show domain chats in focus mode --- src/libs/SidebarUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts index 4e5185c56cc3..39845a71d7f4 100644 --- a/src/libs/SidebarUtils.ts +++ b/src/libs/SidebarUtils.ts @@ -118,7 +118,7 @@ function getOrderedReportIDs( const participantAccountIDs = Object.keys(report?.participants ?? {}).map(Number); - if (currentUserAccountID && AccountUtils.isAccountIDOddNumber(currentUserAccountID) && participantAccountIDs.includes(CONST.ACCOUNT_ID.NOTIFICATIONS)) { + if (currentUserAccountID && AccountUtils.isAccountIDOddNumber(currentUserAccountID) && participantAccountIDs.includes(CONST.ACCOUNT_ID.NOTIFICATIONS) && isSystemChat) { return true; } From 3161cc50f671a1c1f35dde935d4c8654bd201029 Mon Sep 17 00:00:00 2001 From: Wojciech Boman Date: Wed, 19 Jun 2024 15:50:11 +0200 Subject: [PATCH 15/30] Refactor handling isReportInRhpOpened --- src/libs/Navigation/linkTo/index.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts index b1f45e6b32f4..6fee4600885d 100644 --- a/src/libs/Navigation/linkTo/index.ts +++ b/src/libs/Navigation/linkTo/index.ts @@ -67,6 +67,9 @@ export default function linkTo(navigation: NavigationContainerRef route?.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT); + // If action type is different than NAVIGATE we can't change it to the PUSH safely if (action?.type === CONST.NAVIGATION.ACTION_TYPE.NAVIGATE) { const topRouteName = lastRoute?.name; @@ -91,8 +94,6 @@ export default function linkTo(navigation: NavigationContainerRef)?.policyID ?? '') !== ((matchingBottomTabRoute?.params as Record)?.policyID ?? ''); - const isReportInRhpOpened = - lastRoute?.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR && lastRoute?.state?.routes?.includes((route: NavigationPartialRoute) => route?.name === SCREENS.SEARCH.REPORT_RHP); if (topmostBottomTabRoute && (topmostBottomTabRoute.name !== matchingBottomTabRoute.name || isNewPolicyID || isOpeningSearch)) { root.dispatch({ @@ -101,8 +102,7 @@ export default function linkTo(navigation: NavigationContainerRef Date: Wed, 19 Jun 2024 16:20:37 +0200 Subject: [PATCH 16/30] Refactor check isReportInRhpOpened --- src/libs/Navigation/linkingConfig/customGetPathFromState.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/Navigation/linkingConfig/customGetPathFromState.ts b/src/libs/Navigation/linkingConfig/customGetPathFromState.ts index 3ae1ed245ec6..5ebc1d5c1889 100644 --- a/src/libs/Navigation/linkingConfig/customGetPathFromState.ts +++ b/src/libs/Navigation/linkingConfig/customGetPathFromState.ts @@ -18,6 +18,7 @@ const removePolicyIDParamFromState = (state: State) => { }; const customGetPathFromState: typeof getPathFromState = (state, options) => { + console.log('state', state); // For the Home and Settings pages we should remove policyID from the params, because on small screens it's displayed twice in the URL const stateWithoutPolicyID = removePolicyIDParamFromState(state as State); const path = getPathFromState(stateWithoutPolicyID, options); From d9dc3d78433d5450a50fbe5c71de4374f5637de7 Mon Sep 17 00:00:00 2001 From: Wojciech Boman Date: Wed, 19 Jun 2024 16:22:34 +0200 Subject: [PATCH 17/30] Refactor check isReportInRhpOpened --- src/libs/Navigation/linkTo/index.ts | 10 +++++----- .../Navigation/linkingConfig/customGetPathFromState.ts | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts index 6fee4600885d..a523a8e12067 100644 --- a/src/libs/Navigation/linkTo/index.ts +++ b/src/libs/Navigation/linkTo/index.ts @@ -205,12 +205,12 @@ export default function linkTo(navigation: NavigationContainerRef) => { }; const customGetPathFromState: typeof getPathFromState = (state, options) => { - console.log('state', state); // For the Home and Settings pages we should remove policyID from the params, because on small screens it's displayed twice in the URL const stateWithoutPolicyID = removePolicyIDParamFromState(state as State); const path = getPathFromState(stateWithoutPolicyID, options); From ed788a07d23705ddf95151c09ce9890689465bc4 Mon Sep 17 00:00:00 2001 From: Wojciech Boman Date: Wed, 19 Jun 2024 16:28:50 +0200 Subject: [PATCH 18/30] Fix types in linkTo --- src/libs/Navigation/linkTo/index.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts index a523a8e12067..c652a87a80db 100644 --- a/src/libs/Navigation/linkTo/index.ts +++ b/src/libs/Navigation/linkTo/index.ts @@ -21,7 +21,7 @@ import getAdaptedStateFromPath from '@navigation/linkingConfig/getAdaptedStateFr import getMatchingBottomTabRouteForState from '@navigation/linkingConfig/getMatchingBottomTabRouteForState'; import getMatchingCentralPaneRouteForState from '@navigation/linkingConfig/getMatchingCentralPaneRouteForState'; import replacePathInNestedState from '@navigation/linkingConfig/replacePathInNestedState'; -import type {NavigationPartialRoute, NavigationRoot, RootStackParamList, StackNavigationAction, State} from '@navigation/types'; +import type {NavigationRoot, RootStackParamList, StackNavigationAction, State} from '@navigation/types'; import CONST from '@src/CONST'; import NAVIGATORS from '@src/NAVIGATORS'; import type {Route} from '@src/ROUTES'; @@ -67,8 +67,7 @@ export default function linkTo(navigation: NavigationContainerRef route?.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT); + const isReportInRhpOpened = lastRoute?.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR && lastRoute?.state?.routes?.some((route) => route?.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT); // If action type is different than NAVIGATE we can't change it to the PUSH safely if (action?.type === CONST.NAVIGATION.ACTION_TYPE.NAVIGATE) { From 1b970d4c2a6d607dad362cfa06d636dfdd5794ca Mon Sep 17 00:00:00 2001 From: Agata Kosior Date: Wed, 19 Jun 2024 17:05:00 +0200 Subject: [PATCH 19/30] fix: hide persona chat in focus mode --- src/libs/ReportUtils.ts | 2 -- src/libs/SidebarUtils.ts | 6 ------ 2 files changed, 8 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 1e772d7b18f2..5d63d9bbd48a 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -5334,8 +5334,6 @@ function shouldReportBeInOptionList({ report?.reportName === undefined || // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing report?.isHidden || - // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - participantAccountIDs.includes(CONST.ACCOUNT_ID.NOTIFICATIONS) || (participantAccountIDs.length === 0 && !isChatThread(report) && !isPublicRoom(report) && diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts index 39845a71d7f4..313a8fbe6652 100644 --- a/src/libs/SidebarUtils.ts +++ b/src/libs/SidebarUtils.ts @@ -116,12 +116,6 @@ function getOrderedReportIDs( return false; } - const participantAccountIDs = Object.keys(report?.participants ?? {}).map(Number); - - if (currentUserAccountID && AccountUtils.isAccountIDOddNumber(currentUserAccountID) && participantAccountIDs.includes(CONST.ACCOUNT_ID.NOTIFICATIONS) && isSystemChat) { - return true; - } - return ReportUtils.shouldReportBeInOptionList({ report, currentReportId: currentReportId ?? '-1', From e6d83e2d25f7ac0232a01b90937ef74119b584e7 Mon Sep 17 00:00:00 2001 From: Agata Kosior Date: Wed, 19 Jun 2024 18:41:50 +0200 Subject: [PATCH 20/30] fix: lint --- src/libs/SidebarUtils.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts index 313a8fbe6652..071ceebaa67d 100644 --- a/src/libs/SidebarUtils.ts +++ b/src/libs/SidebarUtils.ts @@ -12,7 +12,6 @@ import type PriorityMode from '@src/types/onyx/PriorityMode'; import type Report from '@src/types/onyx/Report'; import type ReportAction from '@src/types/onyx/ReportAction'; import type DeepValueOf from '@src/types/utils/DeepValueOf'; -import AccountUtils from './AccountUtils'; import * as CollectionUtils from './CollectionUtils'; import {hasValidDraftComment} from './DraftCommentUtils'; import localeCompare from './LocaleCompare'; @@ -44,14 +43,6 @@ Onyx.connect({ }, }); -let currentUserAccountID: number | undefined; -Onyx.connect({ - key: ONYXKEYS.SESSION, - callback: (value) => { - currentUserAccountID = value?.accountID; - }, -}); - function compareStringDates(a: string, b: string): 0 | 1 | -1 { if (a < b) { return -1; From 54aa5f649e58aad267fb82e1d997339db62654fc Mon Sep 17 00:00:00 2001 From: Agata Kosior Date: Wed, 19 Jun 2024 19:21:21 +0200 Subject: [PATCH 21/30] fix: show persona for onboarded users --- src/libs/ReportUtils.ts | 2 ++ src/libs/SidebarUtils.ts | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 5d63d9bbd48a..1e772d7b18f2 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -5334,6 +5334,8 @@ function shouldReportBeInOptionList({ report?.reportName === undefined || // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing report?.isHidden || + // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing + participantAccountIDs.includes(CONST.ACCOUNT_ID.NOTIFICATIONS) || (participantAccountIDs.length === 0 && !isChatThread(report) && !isPublicRoom(report) && diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts index 071ceebaa67d..eef98b213dec 100644 --- a/src/libs/SidebarUtils.ts +++ b/src/libs/SidebarUtils.ts @@ -12,6 +12,7 @@ import type PriorityMode from '@src/types/onyx/PriorityMode'; import type Report from '@src/types/onyx/Report'; import type ReportAction from '@src/types/onyx/ReportAction'; import type DeepValueOf from '@src/types/utils/DeepValueOf'; +import AccountUtils from './AccountUtils'; import * as CollectionUtils from './CollectionUtils'; import {hasValidDraftComment} from './DraftCommentUtils'; import localeCompare from './LocaleCompare'; @@ -43,6 +44,14 @@ Onyx.connect({ }, }); +let currentUserAccountID: number | undefined; +Onyx.connect({ + key: ONYXKEYS.SESSION, + callback: (value) => { + currentUserAccountID = value?.accountID; + }, +}); + function compareStringDates(a: string, b: string): 0 | 1 | -1 { if (a < b) { return -1; @@ -107,6 +116,13 @@ function getOrderedReportIDs( return false; } + const participantAccountIDs = Object.keys(report?.participants ?? {}).map(Number); + const isOnboardedByPersona = currentUserAccountID && AccountUtils.isAccountIDOddNumber(currentUserAccountID) && participantAccountIDs.includes(CONST.ACCOUNT_ID.NOTIFICATIONS); + + if (isOnboardedByPersona && isSystemChat && !isInFocusMode) { + return true; + } + return ReportUtils.shouldReportBeInOptionList({ report, currentReportId: currentReportId ?? '-1', From 3e3e6bc57e6778602086e2b294dfb03c666c9819 Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Wed, 19 Jun 2024 22:14:31 -0700 Subject: [PATCH 22/30] Add beta to handle the NetSuite beta in NewDot --- src/CONST.ts | 2 ++ src/libs/Permissions.ts | 5 +++++ src/pages/workspace/accounting/PolicyAccountingPage.tsx | 7 +++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/CONST.ts b/src/CONST.ts index 1d6c3a92faa9..48c4fb359239 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -363,6 +363,7 @@ const CONST = { SPOTNANA_TRAVEL: 'spotnanaTravel', ACCOUNTING_ON_NEW_EXPENSIFY: 'accountingOnNewExpensify', XERO_ON_NEW_EXPENSIFY: 'xeroOnNewExpensify', + NETSUITE_ON_NEW_EXPENSIFY: 'netsuiteOnNewExpensify', }, BUTTON_STATES: { DEFAULT: 'default', @@ -1798,6 +1799,7 @@ const CONST = { // Here we will add other connections names when we add support for them QBO: 'quickbooksOnline', XERO: 'xero', + NETSUITE: 'netsuite', }, SYNC_STAGE_NAME: { STARTING_IMPORT_QBO: 'startingImportQBO', diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index 7ef4c9325a14..0996169d1bfc 100644 --- a/src/libs/Permissions.ts +++ b/src/libs/Permissions.ts @@ -48,6 +48,10 @@ function canUseXeroIntegration(betas: OnyxEntry): boolean { return !!betas?.includes(CONST.BETAS.XERO_ON_NEW_EXPENSIFY) || canUseAllBetas(betas); } +function canUseNetSuiteIntegration(betas: OnyxEntry): boolean { + return !!betas?.includes(CONST.BETAS.NETSUITE_ON_NEW_EXPENSIFY) || canUseAllBetas(betas); +} + /** * Link previews are temporarily disabled. */ @@ -67,4 +71,5 @@ export default { canUseSpotnanaTravel, canUseAccountingIntegrations, canUseXeroIntegration, + canUseNetSuiteIntegration, }; diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx index 78dc434b3d2c..b02a86603578 100644 --- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx +++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx @@ -110,7 +110,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting const styles = useThemeStyles(); const {translate} = useLocalize(); const {isOffline} = useNetwork(); - const {canUseXeroIntegration} = usePermissions(); + const {canUseXeroIntegration, canUseNetSuiteIntegration} = usePermissions(); const {isSmallScreenWidth, windowWidth} = useWindowDimensions(); const [threeDotsMenuPosition, setThreeDotsMenuPosition] = useState({horizontal: 0, vertical: 0}); const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false); @@ -124,7 +124,10 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting isValid(lastSyncProgressDate) && differenceInMinutes(new Date(), lastSyncProgressDate) < CONST.POLICY.CONNECTIONS.SYNC_STAGE_TIMEOUT_MINUTES; - const accountingIntegrations = Object.values(CONST.POLICY.CONNECTIONS.NAME).filter((name) => !(name === CONST.POLICY.CONNECTIONS.NAME.XERO && !canUseXeroIntegration)); + const accountingIntegrations = Object.values(CONST.POLICY.CONNECTIONS.NAME).filter((name) => + !(name === CONST.POLICY.CONNECTIONS.NAME.XERO && !canUseXeroIntegration) && + !(name === CONST.POLICY.CONNECTIONS.NAME.NETSUITE && !canUseNetSuiteIntegration) + ); const connectedIntegration = accountingIntegrations.find((integration) => !!policy?.connections?.[integration]) ?? connectionSyncProgress?.connectionName; const policyID = policy?.id ?? '-1'; const successfulDate = policy?.connections?.quickbooksOnline?.lastSync?.successfulDate; From 296e8ddce84c7ebafe926440060ef2ef33571acb Mon Sep 17 00:00:00 2001 From: Wojciech Boman Date: Thu, 20 Jun 2024 16:37:54 +0200 Subject: [PATCH 23/30] Refactor check isReportInRhpOpened --- src/libs/Navigation/linkTo/index.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts index c652a87a80db..7e49c1613a62 100644 --- a/src/libs/Navigation/linkTo/index.ts +++ b/src/libs/Navigation/linkTo/index.ts @@ -204,12 +204,12 @@ export default function linkTo(navigation: NavigationContainerRef Date: Thu, 20 Jun 2024 13:15:13 -0700 Subject: [PATCH 24/30] prettier --- src/pages/workspace/accounting/PolicyAccountingPage.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx index b02a86603578..f2e3744f92e4 100644 --- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx +++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx @@ -124,9 +124,8 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting isValid(lastSyncProgressDate) && differenceInMinutes(new Date(), lastSyncProgressDate) < CONST.POLICY.CONNECTIONS.SYNC_STAGE_TIMEOUT_MINUTES; - const accountingIntegrations = Object.values(CONST.POLICY.CONNECTIONS.NAME).filter((name) => - !(name === CONST.POLICY.CONNECTIONS.NAME.XERO && !canUseXeroIntegration) && - !(name === CONST.POLICY.CONNECTIONS.NAME.NETSUITE && !canUseNetSuiteIntegration) + const accountingIntegrations = Object.values(CONST.POLICY.CONNECTIONS.NAME).filter( + (name) => !(name === CONST.POLICY.CONNECTIONS.NAME.XERO && !canUseXeroIntegration) && !(name === CONST.POLICY.CONNECTIONS.NAME.NETSUITE && !canUseNetSuiteIntegration), ); const connectedIntegration = accountingIntegrations.find((integration) => !!policy?.connections?.[integration]) ?? connectionSyncProgress?.connectionName; const policyID = policy?.id ?? '-1'; From a1d5ab1beca8937da5b48e65e740a7c78a73f0bf Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Thu, 20 Jun 2024 13:30:24 -0700 Subject: [PATCH 25/30] Add exception for NetSuite in error checking logic --- src/libs/actions/connections/index.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts index 4770722aca21..9707040a8b18 100644 --- a/src/libs/actions/connections/index.ts +++ b/src/libs/actions/connections/index.ts @@ -236,6 +236,11 @@ function updateManyPolicyConnectionConfigs, connectionName: PolicyConnectionName, isSyncInProgress: boolean): boolean { + // NetSuite does not use the conventional lastSync object, so we need to check for lastErrorSyncDate + if (connectionName === CONST.POLICY.CONNECTIONS.NAME.NETSUITE) { + return !isSyncInProgress && !!policy?.connections?.[CONST.POLICY.CONNECTIONS.NAME.NETSUITE].lastErrorSyncDate + } + return !isSyncInProgress && policy?.connections?.[connectionName]?.lastSync?.isSuccessful === false; } From 790f70b5066c16e0e9ccf3355d1d4114193b9dea Mon Sep 17 00:00:00 2001 From: Sheena Trepanier Date: Thu, 20 Jun 2024 13:37:47 -0700 Subject: [PATCH 26/30] Update redirects.csv https://github.com/Expensify/App/pull/43882 --- docs/redirects.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/redirects.csv b/docs/redirects.csv index 13463327d06d..b4912a629918 100644 --- a/docs/redirects.csv +++ b/docs/redirects.csv @@ -201,3 +201,4 @@ https://help.expensify.com/articles/expensify-classic/workspaces/reports/Report- https://help.expensify.com/articles/expensify-classic/workspaces/reports/Scheduled-Submit,https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports https://help.expensify.com/articles/new-expensify/chat/Expensify-Chat-For-Admins,https://help.expensify.com/new-expensify/hubs/chat/ https://help.expensify.com/articles/new-expensify/bank-accounts-and-payments/Connect-a-Bank-Account.html,https://help.expensify.com/articles/new-expensify/expenses/Connect-a-Business-Bank-Account +https://help.expensify.com/articles/new-expensify/expenses/Manually-submit-reports-for-approval,https://help.expensify.com/new-expensify/hubs/expenses/ From 9b8cf91466dd0a37dd0d226cb190c6b4fe2d1b17 Mon Sep 17 00:00:00 2001 From: Yuwen Memon Date: Thu, 20 Jun 2024 13:39:29 -0700 Subject: [PATCH 27/30] Prettier --- src/libs/actions/connections/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts index 9707040a8b18..d0c9fb762a4c 100644 --- a/src/libs/actions/connections/index.ts +++ b/src/libs/actions/connections/index.ts @@ -238,7 +238,7 @@ function updateManyPolicyConnectionConfigs, connectionName: PolicyConnectionName, isSyncInProgress: boolean): boolean { // NetSuite does not use the conventional lastSync object, so we need to check for lastErrorSyncDate if (connectionName === CONST.POLICY.CONNECTIONS.NAME.NETSUITE) { - return !isSyncInProgress && !!policy?.connections?.[CONST.POLICY.CONNECTIONS.NAME.NETSUITE].lastErrorSyncDate + return !isSyncInProgress && !!policy?.connections?.[CONST.POLICY.CONNECTIONS.NAME.NETSUITE].lastErrorSyncDate; } return !isSyncInProgress && policy?.connections?.[connectionName]?.lastSync?.isSuccessful === false; From bbd1d834e3e6474ad94df53525c35406548138e5 Mon Sep 17 00:00:00 2001 From: Github Date: Thu, 20 Jun 2024 14:42:10 -0600 Subject: [PATCH 28/30] Add checkout and inline `npm version` to fix HybridApp deploys --- .github/workflows/platformDeploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index dd169a25c63d..c9a424238018 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -372,11 +372,11 @@ jobs: needs: validateActor if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) && github.event_name == 'push' }} steps: - - name: Get version - run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV" + - name: Checkout + uses: actions/checkout@v4 - name: 'Deploy HybridApp' - run: gh workflow run --repo Expensify/Mobile-Deploy deploy.yml -f force_build=true -f build_version=${{ env.VERSION }} + run: gh workflow run --repo Expensify/Mobile-Deploy deploy.yml -f force_build=true -f build_version=$(npm run print-version --silent) env: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} From 6f9361191a8c3a6f3098094ea7c8cfd51506c6e9 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Thu, 20 Jun 2024 14:46:24 -0600 Subject: [PATCH 29/30] Update .github/workflows/platformDeploy.yml Co-authored-by: Rory Abraham <47436092+roryabraham@users.noreply.github.com> --- .github/workflows/platformDeploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index c9a424238018..640d1eaa1172 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -376,7 +376,7 @@ jobs: uses: actions/checkout@v4 - name: 'Deploy HybridApp' - run: gh workflow run --repo Expensify/Mobile-Deploy deploy.yml -f force_build=true -f build_version=$(npm run print-version --silent) + run: gh workflow run --repo Expensify/Mobile-Deploy deploy.yml -f force_build=true -f build_version="$(npm run print-version --silent)" env: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} From 6f9f5e00876fa9c02024cda8763573c606cc9242 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 20 Jun 2024 20:56:40 +0000 Subject: [PATCH 30/30] Update version to 9.0.0-3 --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index fd3e0eb64d58..32dc2a6cc4af 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -107,8 +107,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009000002 - versionName "9.0.0-2" + versionCode 1009000003 + versionName "9.0.0-3" // 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" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 94b35ee850b9..38eac98100b2 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 9.0.0.2 + 9.0.0.3 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 4770a8c3cff2..9f14bfdf9b2f 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.0.2 + 9.0.0.3 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index fbda3047916a..f285614ce618 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.0 CFBundleVersion - 9.0.0.2 + 9.0.0.3 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index d6bdfed26b63..167dec05497f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.0-2", + "version": "9.0.0-3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.0-2", + "version": "9.0.0-3", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 88bbbcd12436..e520f430541e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.0-2", + "version": "9.0.0-3", "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.",