From 80b738af53f0192011c85130b728acc64b17404f Mon Sep 17 00:00:00 2001 From: Rodrigo Lino da Costa Date: Thu, 25 Jul 2024 15:29:57 -0300 Subject: [PATCH 1/2] removing SearchActionOptionsUtils file --- .../Search/SearchActionOptionsUtils.tsx | 16 ---------- src/components/Search/SearchPageHeader.tsx | 30 +++++++++---------- 2 files changed, 15 insertions(+), 31 deletions(-) delete mode 100644 src/components/Search/SearchActionOptionsUtils.tsx diff --git a/src/components/Search/SearchActionOptionsUtils.tsx b/src/components/Search/SearchActionOptionsUtils.tsx deleted file mode 100644 index 20601abd3696..000000000000 --- a/src/components/Search/SearchActionOptionsUtils.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types'; -import * as Expensicons from '@components/Icon/Expensicons'; -import CONST from '@src/CONST'; -import type {SearchHeaderOptionValue} from './SearchPageHeader'; - -function getDownloadOption(text: string, onSelected?: () => void): DropdownOption { - return { - icon: Expensicons.Download, - text, - value: CONST.SEARCH.BULK_ACTION_TYPES.EXPORT, - shouldCloseModalOnSelect: true, - onSelected, - }; -} - -export default getDownloadOption; diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx index bd1e053b1c7e..45699370f6e5 100644 --- a/src/components/Search/SearchPageHeader.tsx +++ b/src/components/Search/SearchPageHeader.tsx @@ -19,7 +19,6 @@ import ROUTES from '@src/ROUTES'; import type {SearchQuery, SearchReport} from '@src/types/onyx/SearchResults'; import type DeepValueOf from '@src/types/utils/DeepValueOf'; import type IconAsset from '@src/types/utils/IconAsset'; -import getDownloadOption from './SearchActionOptionsUtils'; import {useSearchContext} from './SearchContext'; import type {SelectedTransactions} from './types'; @@ -74,22 +73,23 @@ function SearchPageHeader({ const options: Array> = []; - // Because of some problems with the lib we use for download on native we are only enabling download for web, we should remove the SearchActionOptionsUtils files when https://github.com/Expensify/App/issues/45511 is done - const downloadOption = getDownloadOption(translate('common.download'), () => { - if (isOffline) { - setOfflineModalOpen?.(); - return; - } - - SearchActions.exportSearchItemsToCSV(query, selectedReports, selectedTransactionsKeys, [activeWorkspaceID ?? ''], () => { - setDownloadErrorModalOpen?.(); - }); + options.push({ + icon: Expensicons.Download, + text: translate('common.download'), + value: CONST.SEARCH.BULK_ACTION_TYPES.EXPORT, + shouldCloseModalOnSelect: true, + onSelected: () => { + if (isOffline) { + setOfflineModalOpen?.(); + return; + } + + SearchActions.exportSearchItemsToCSV(query, selectedReports, selectedTransactionsKeys, [activeWorkspaceID ?? ''], () => { + setDownloadErrorModalOpen?.(); + }); + }, }); - if (downloadOption) { - options.push(downloadOption); - } - const shouldShowHoldOption = !isOffline && selectedTransactionsKeys.every((id) => selectedTransactions[id].canHold); if (shouldShowHoldOption) { From 1710fc371d5346bd7a2f807d1c5aaf7695f79b82 Mon Sep 17 00:00:00 2001 From: Rodrigo Lino da Costa Date: Thu, 25 Jul 2024 16:04:36 -0300 Subject: [PATCH 2/2] rollback ios files --- ios/NewExpensify.xcodeproj/project.pbxproj | 36 ++++++++++++++++++---- ios/Podfile.lock | 4 +-- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index 164f8485129b..3afc8d4e6cf0 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -1580,7 +1580,11 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = "$(inherited)"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); PRODUCT_BUNDLE_IDENTIFIER = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; @@ -1648,7 +1652,11 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = "$(inherited)"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); PRODUCT_BUNDLE_IDENTIFIER = ""; PRODUCT_NAME = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; @@ -1726,7 +1734,11 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = "$(inherited)"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); PRODUCT_BUNDLE_IDENTIFIER = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; @@ -1871,7 +1883,11 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = "$(inherited)"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); PRODUCT_BUNDLE_IDENTIFIER = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; @@ -2008,7 +2024,11 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = "$(inherited)"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); PRODUCT_BUNDLE_IDENTIFIER = ""; PRODUCT_NAME = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; @@ -2143,7 +2163,11 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = "$(inherited)"; + OTHER_LDFLAGS = ( + "$(inherited)", + "-Wl", + "-ld_classic", + ); PRODUCT_BUNDLE_IDENTIFIER = ""; PRODUCT_NAME = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9a07bf642449..a2d1e0617a1d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2631,8 +2631,8 @@ SPEC CHECKSUMS: SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2 VisionCamera: 1394a316c7add37e619c48d7aa40b38b954bf055 - Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70 + Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312 PODFILE CHECKSUM: d5e281e5370cb0211a104efd90eb5fa7af936e14 -COCOAPODS: 1.15.2 +COCOAPODS: 1.15.2 \ No newline at end of file