Update

Expensify · Apr 21, 2024 · a323a21 · a323a21
1 parent 46a6c3e
commit a323a21
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 84 deletions.
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,5 +1,3 @@
-use_frameworks! :linkage => :static
-
 require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
 # Set the type of Mapbox SDK to use
 # This value is used by $RNMapboxMaps
@@ -113,21 +111,6 @@ target 'NewExpensify' do
         end
       end
     end
-
-    deployment_target = '13.4'
-
-    installer.generated_projects.each do |project|
-        project.targets.each do |target|
-            target.build_configurations.each do |config|
-                config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
-            end
-        end
-        project.build_configurations.each do |config|
-            config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
-        end
-    end
-
-    `sed -i -e  $'s/__IPHONE_10_0/__IPHONE_15_0/' #{installer.sandbox.root}/RCT-Folly/folly/portability/Time.h`
   end
 end
 

diff --git a/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx b/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
@@ -12,7 +12,7 @@ import * as Console from '@libs/actions/Console';
 import {parseStringifiedMessages} from '@libs/Console';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {CapturedLogs, Log} from '@src/types/onyx';
-import ConsoleModal from "@components/ClientSideLoggingToolMenu/ConsoleModal";
+import ConsoleModal from "./ConsoleModal";
 
 type BaseClientSideLoggingToolMenuOnyxProps = {
     /** Logs captured on the current device */
@@ -74,10 +74,10 @@ function BaseClientSideLoggingToolMenu({shouldStoreLogs, capturedLogs, file, onS
                 />
             </TestToolRow>
             {!!shouldStoreLogs && isViaTestToolsModal &&
-                <TestToolRow title={'Debug console'}>
+                <TestToolRow title={translate('initialSettingsPage.troubleshoot.debugConsole')}>
                     <Button
                         small
-                        text={'View logs'}
+                        text={translate('initialSettingsPage.debugConsole.viewConsole')}
                         onPress={() => setIsConsoleModalVisible(true)}
                     />
                 </TestToolRow>

diff --git a/src/components/ClientSideLoggingToolMenu/ConsoleComponents.tsx b/src/components/ClientSideLoggingToolMenu/ConsoleComponents.tsx
@@ -1,13 +1,15 @@
 import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import {ListRenderItem, ListRenderItemInfo, View} from 'react-native';
+import type {ListRenderItem, ListRenderItemInfo} from 'react-native';
+import {View} from 'react-native';
 import CONST from "@src/CONST";
 import useThemeStyles from "@hooks/useThemeStyles";
 import useLocalize from "@hooks/useLocalize";
 import InvertedFlatList from "@components/InvertedFlatList";
 import Text from "@components/Text";
-import {CapturedLogs, Log} from "@src/types/onyx";
+import type {CapturedLogs, Log} from "@src/types/onyx";
 import {format} from "date-fns";
-import {OnyxEntry, withOnyx} from "react-native-onyx";
+import {withOnyx} from "react-native-onyx";
+import type {OnyxEntry} from "react-native-onyx";
 import ONYXKEYS from "@src/ONYXKEYS";
 import {createLog, parseStringifiedMessages, sanitizeConsoleInput} from "@libs/Console";
 import {addLog} from "@userActions/Console";
@@ -130,40 +132,6 @@ function ConsoleComponents({capturedLogs, shouldStoreLogs, onClose, isViaTestToo
                 />
             </View>
 
-            <View style={[styles.dFlex, styles.flexRow, styles.m5, mhModal]}>
-                <Button
-                    text={translate('initialSettingsPage.debugConsole.saveLog')}
-                    onPress={saveLogs}
-                    large
-                    icon={Expensicons.Download}
-                    style={[styles.flex1, styles.mr1]}
-                />
-                <Button
-                    text={translate('initialSettingsPage.debugConsole.shareLog')}
-                    onPress={shareLogs}
-                    large
-                    icon={!isGeneratingLogsFile ? Expensicons.UploadAlt : undefined}
-                    style={[styles.flex1, styles.ml1]}
-                    isLoading={isGeneratingLogsFile}
-                />
-            </View>
-            <View style={[styles.mh5, mhModal]}>
-                <TextInput
-                    onChangeText={setInput}
-                    value={input}
-                    placeholder={translate('initialSettingsPage.debugConsole.enterCommand')}
-                    autoGrowHeight
-                    autoCorrect={false}
-                    accessibilityRole="text"
-                />
-                <Button
-                    success
-                    text={translate('initialSettingsPage.debugConsole.execute')}
-                    onPress={executeArbitraryCode}
-                    style={[styles.mt5]}
-                    large
-                />
-            </View>
             <ConfirmModal
                 title={translate('initialSettingsPage.debugConsole.shareLog')}
                 isVisible={isLimitModalVisible}

diff --git a/src/components/ClientSideLoggingToolMenu/ConsoleModal.tsx b/src/components/ClientSideLoggingToolMenu/ConsoleModal.tsx
@@ -1,31 +1,10 @@
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import {ListRenderItem, ListRenderItemInfo, View} from 'react-native';
-import ConsolePage from "@pages/settings/AboutPage/ConsolePage";
+import React from 'react';
+import {View} from 'react-native';
 import CONST from "@src/CONST";
 import Modal from "@components/Modal";
 import useWindowDimensions from "@hooks/useWindowDimensions";
 import useStyleUtils from "@hooks/useStyleUtils";
-import useThemeStyles from "@hooks/useThemeStyles";
-import useLocalize from "@hooks/useLocalize";
-import InvertedFlatList from "@components/InvertedFlatList";
-import Text from "@components/Text";
-import {CapturedLogs, Log} from "@src/types/onyx";
-import {format} from "date-fns";
-import {OnyxEntry, withOnyx} from "react-native-onyx";
-import ONYXKEYS from "@src/ONYXKEYS";
-import {createLog, parseStringifiedMessages, sanitizeConsoleInput} from "@libs/Console";
-import {addLog} from "@userActions/Console";
-import useKeyboardShortcut from "@hooks/useKeyboardShortcut";
-import localFileDownload from "@libs/localFileDownload";
-import localFileCreate from "@libs/localFileCreate";
-import Navigation from "@navigation/Navigation";
-import ROUTES from "@src/ROUTES";
-import Button from "@components/Button";
-import * as Expensicons from "@components/Icon/Expensicons";
-import TextInput from "@components/TextInput";
-import ConfirmModal from "@components/ConfirmModal";
-import ShareLogList from "@pages/settings/AboutPage/ShareLogList";
-import ConsoleComponents from "@components/ClientSideLoggingToolMenu/ConsoleComponents";
+import ConsoleComponents from "./ConsoleComponents";
 
 type ConsoleModalProps = {
     /** Locally created file */
@@ -52,8 +31,7 @@ function ConsoleModal({isVisible, onClose, closeTestToolsModal}: ConsoleModalPro
                         onClose()
                     }
                     closeTestToolsModal()
-                }}
-                                   isViaTestToolsModal/>
+                }} isViaTestToolsModal/>
             </View>
         </Modal>
     );

diff --git a/src/components/TestToolsModal.tsx b/src/components/TestToolsModal.tsx
@@ -32,7 +32,7 @@ function TestToolsModal({isTestToolsModalOpen = false}: TestToolsModalProps) {
 
     return (
         <Modal
-            isVisible={!!isTestToolsModalOpen}
+            isVisible={true}
             type={CONST.MODAL.MODAL_TYPE.CENTERED_SMALL}
             onClose={toggleTestToolsModal}
         >

diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -914,6 +914,7 @@ export default {
             noLogsAvailable: 'No logs available',
             logSizeTooLarge: ({size}: LogSizeParams) => `Log size exceeds the limit of ${size} MB. Please use "Save log" to download the log file instead.`,
             logs: 'Logs',
+            viewConsole: 'View console',
         },
         security: 'Security',
         signOut: 'Sign out',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -909,6 +909,7 @@ export default {
             noLogsAvailable: 'No hay registros disponibles',
             logSizeTooLarge: ({size}: LogSizeParams) => `El tamaño del registro excede el límite de ${size} MB. Utilice "Guardar registro" para descargar el archivo de registro.`,
             logs: 'Logs',
+            viewConsole: 'Ver consola',
         },
         security: 'Seguridad',
         restoreStashed: 'Restablecer login guardado',