From 92a1116b0b74444edf61955f9fa5cc1c93c0db37 Mon Sep 17 00:00:00 2001 From: chiragsalian Date: Mon, 9 May 2022 16:33:47 -0700 Subject: [PATCH 1/3] testing no dots and assistance button --- ios/NewExpensify.xcodeproj/project.pbxproj | 20 ++++++++++---------- ios/Podfile.lock | 20 +++++++++++++------- src/pages/workspace/WorkspaceInitialPage.js | 14 -------------- 3 files changed, 23 insertions(+), 31 deletions(-) diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index 8f47635f6751..11d1b5e78da6 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -531,11 +531,11 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Onfido/Onfido.framework/Onfido", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/LinkKit/LinkKit.framework/LinkKit", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes/hermes.framework/hermes", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/Plaid/LinkKit.framework/LinkKit", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -707,11 +707,11 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NewExpensify/Pods-NewExpensify-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Onfido/Onfido.framework/Onfido", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/LinkKit/LinkKit.framework/LinkKit", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes/hermes.framework/hermes", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/Plaid/LinkKit.framework/LinkKit", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -940,7 +940,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1001,7 +1001,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index fb504dc289e7..11c59227fea7 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -435,6 +435,8 @@ PODS: - React-jsinspector (0.66.4) - React-logger (0.66.4): - glog + - react-native-cameraroll (4.1.2): + - React-Core - react-native-config (1.4.5): - react-native-config/App (= 1.4.5) - react-native-config/App (1.4.5): @@ -445,7 +447,7 @@ PODS: - React-Core - react-native-image-picker (4.7.3): - React-Core - - react-native-netinfo (8.0.0): + - react-native-netinfo (8.3.0): - React-Core - react-native-pdf (6.2.2): - React-Core @@ -535,7 +537,7 @@ PODS: - React-Core - RNCMaskedView (0.2.4): - React-Core - - RNCPicker (1.9.11): + - RNCPicker (2.3.1): - React-Core - RNDateTimePicker (3.5.2): - React-Core @@ -659,6 +661,7 @@ DEPENDENCIES: - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - React-logger (from `../node_modules/react-native/ReactCommon/logger`) + - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)" - react-native-config (from `../node_modules/react-native-config`) - react-native-document-picker (from `../node_modules/react-native-document-picker`) - react-native-flipper (from `../node_modules/react-native-flipper`) @@ -787,6 +790,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsinspector" React-logger: :path: "../node_modules/react-native/ReactCommon/logger" + react-native-cameraroll: + :path: "../node_modules/@react-native-community/cameraroll" react-native-config: :path: "../node_modules/react-native-config" react-native-document-picker: @@ -878,7 +883,7 @@ SPEC CHECKSUMS: Airship: 29d674abeac754f783fc46c7d383d6f046687341 boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de + DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1 FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58 Firebase: 54cdc8bc9c9b3de54f43dab86e62f5a76b47034f @@ -900,7 +905,7 @@ SPEC CHECKSUMS: Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 + glog: 5337263514dd6f09803962437687240c5dc39aa4 GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342 GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 @@ -930,11 +935,12 @@ SPEC CHECKSUMS: React-jsiexecutor: 94ce921e1d8ce7023366873ec371f3441383b396 React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85 React-logger: 933f80c97c633ee8965d609876848148e3fef438 + react-native-cameraroll: 60ac50a5209777cbccfe8d7a62d0743a9da87060 react-native-config: 6502b1879f97ed5ac570a029961fc35ea606cd14 react-native-document-picker: 772d04a4bc5c35da9abe27b08ac271420ae3f9ef react-native-flipper: cd9eabd8917104c1bbdca2621717cdca3b2addef react-native-image-picker: ae1202414bd5c37c00b2a701daa5b6194a06b7d9 - react-native-netinfo: 0124c0695373fce63cea24aeebb97ab2d237947a + react-native-netinfo: ebbcd8fbe1a0ce7035e43cd18c5a545dcb93dd08 react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f react-native-performance: 8edfa2bbc9a2af4a02f01d342118e413a95145e0 react-native-plaid-link-sdk: 9e0ebdaed648a237b36d5f6f6292b5147af92da7 @@ -958,7 +964,7 @@ SPEC CHECKSUMS: RNCAsyncStorage: 8324611026e8dc3706f829953aa6e3899f581589 RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3 RNCMaskedView: 138134c4d8a9421b4f2bf39055a79aa05c2d47b1 - RNCPicker: 6780c753e9e674065db90d9c965920516402579d + RNCPicker: f6c760d4b314585ff35165d8640d7917ae30afb1 RNDateTimePicker: c9911be59b1f8670b9f244b85af3a7c295e175ed RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7 RNFBAnalytics: 8ba84c2d31c64374d054c8621b998f25145ffddc @@ -979,4 +985,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 431123d7514c52fa4516724b89c20d02c87ad8c8 -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3 diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js index 3e43faf56c14..2681476364b0 100644 --- a/src/pages/workspace/WorkspaceInitialPage.js +++ b/src/pages/workspace/WorkspaceInitialPage.js @@ -120,21 +120,7 @@ class WorkspaceInitialPage extends React.Component { shouldShowBackButton onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS)} onCloseButtonPress={() => Navigation.dismissModal()} - shouldShowThreeDotsButton - shouldShowGetAssistanceButton guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_INITIAL} - threeDotsMenuItems={[ - { - icon: Expensicons.Plus, - text: this.props.translate('workspace.new.newWorkspace'), - onSelected: () => PolicyActions.createAndNavigate(), - }, { - icon: Expensicons.Trashcan, - text: this.props.translate('workspace.common.delete'), - onSelected: () => this.setState({isDeleteModalOpen: true}), - }, - ]} - threeDotsAnchorPosition={styles.threeDotsPopoverOffset} /> Date: Mon, 9 May 2022 16:36:54 -0700 Subject: [PATCH 2/3] Revert "testing no dots and assistance button" This reverts commit 92a1116b0b74444edf61955f9fa5cc1c93c0db37. --- ios/NewExpensify.xcodeproj/project.pbxproj | 20 ++++++++++---------- ios/Podfile.lock | 20 +++++++------------- src/pages/workspace/WorkspaceInitialPage.js | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index 11d1b5e78da6..8f47635f6751 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -531,11 +531,11 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Onfido/Onfido.framework/Onfido", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/Plaid/LinkKit.framework/LinkKit", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/LinkKit/LinkKit.framework/LinkKit", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -707,11 +707,11 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NewExpensify/Pods-NewExpensify-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Onfido/Onfido.framework/Onfido", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/Plaid/LinkKit.framework/LinkKit", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/LinkKit/LinkKit.framework/LinkKit", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -940,7 +940,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1001,7 +1001,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 11c59227fea7..fb504dc289e7 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -435,8 +435,6 @@ PODS: - React-jsinspector (0.66.4) - React-logger (0.66.4): - glog - - react-native-cameraroll (4.1.2): - - React-Core - react-native-config (1.4.5): - react-native-config/App (= 1.4.5) - react-native-config/App (1.4.5): @@ -447,7 +445,7 @@ PODS: - React-Core - react-native-image-picker (4.7.3): - React-Core - - react-native-netinfo (8.3.0): + - react-native-netinfo (8.0.0): - React-Core - react-native-pdf (6.2.2): - React-Core @@ -537,7 +535,7 @@ PODS: - React-Core - RNCMaskedView (0.2.4): - React-Core - - RNCPicker (2.3.1): + - RNCPicker (1.9.11): - React-Core - RNDateTimePicker (3.5.2): - React-Core @@ -661,7 +659,6 @@ DEPENDENCIES: - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - React-logger (from `../node_modules/react-native/ReactCommon/logger`) - - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)" - react-native-config (from `../node_modules/react-native-config`) - react-native-document-picker (from `../node_modules/react-native-document-picker`) - react-native-flipper (from `../node_modules/react-native-flipper`) @@ -790,8 +787,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsinspector" React-logger: :path: "../node_modules/react-native/ReactCommon/logger" - react-native-cameraroll: - :path: "../node_modules/@react-native-community/cameraroll" react-native-config: :path: "../node_modules/react-native-config" react-native-document-picker: @@ -883,7 +878,7 @@ SPEC CHECKSUMS: Airship: 29d674abeac754f783fc46c7d383d6f046687341 boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 + DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1 FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58 Firebase: 54cdc8bc9c9b3de54f43dab86e62f5a76b47034f @@ -905,7 +900,7 @@ SPEC CHECKSUMS: Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 5337263514dd6f09803962437687240c5dc39aa4 + glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62 GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342 GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940 GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 @@ -935,12 +930,11 @@ SPEC CHECKSUMS: React-jsiexecutor: 94ce921e1d8ce7023366873ec371f3441383b396 React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85 React-logger: 933f80c97c633ee8965d609876848148e3fef438 - react-native-cameraroll: 60ac50a5209777cbccfe8d7a62d0743a9da87060 react-native-config: 6502b1879f97ed5ac570a029961fc35ea606cd14 react-native-document-picker: 772d04a4bc5c35da9abe27b08ac271420ae3f9ef react-native-flipper: cd9eabd8917104c1bbdca2621717cdca3b2addef react-native-image-picker: ae1202414bd5c37c00b2a701daa5b6194a06b7d9 - react-native-netinfo: ebbcd8fbe1a0ce7035e43cd18c5a545dcb93dd08 + react-native-netinfo: 0124c0695373fce63cea24aeebb97ab2d237947a react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f react-native-performance: 8edfa2bbc9a2af4a02f01d342118e413a95145e0 react-native-plaid-link-sdk: 9e0ebdaed648a237b36d5f6f6292b5147af92da7 @@ -964,7 +958,7 @@ SPEC CHECKSUMS: RNCAsyncStorage: 8324611026e8dc3706f829953aa6e3899f581589 RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3 RNCMaskedView: 138134c4d8a9421b4f2bf39055a79aa05c2d47b1 - RNCPicker: f6c760d4b314585ff35165d8640d7917ae30afb1 + RNCPicker: 6780c753e9e674065db90d9c965920516402579d RNDateTimePicker: c9911be59b1f8670b9f244b85af3a7c295e175ed RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7 RNFBAnalytics: 8ba84c2d31c64374d054c8621b998f25145ffddc @@ -985,4 +979,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 431123d7514c52fa4516724b89c20d02c87ad8c8 -COCOAPODS: 1.11.3 +COCOAPODS: 1.11.2 diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js index 2681476364b0..3e43faf56c14 100644 --- a/src/pages/workspace/WorkspaceInitialPage.js +++ b/src/pages/workspace/WorkspaceInitialPage.js @@ -120,7 +120,21 @@ class WorkspaceInitialPage extends React.Component { shouldShowBackButton onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS)} onCloseButtonPress={() => Navigation.dismissModal()} + shouldShowThreeDotsButton + shouldShowGetAssistanceButton guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_INITIAL} + threeDotsMenuItems={[ + { + icon: Expensicons.Plus, + text: this.props.translate('workspace.new.newWorkspace'), + onSelected: () => PolicyActions.createAndNavigate(), + }, { + icon: Expensicons.Trashcan, + text: this.props.translate('workspace.common.delete'), + onSelected: () => this.setState({isDeleteModalOpen: true}), + }, + ]} + threeDotsAnchorPosition={styles.threeDotsPopoverOffset} /> Date: Mon, 9 May 2022 16:37:28 -0700 Subject: [PATCH 3/3] removing dot and assistance button --- src/pages/workspace/WorkspaceInitialPage.js | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js index 3e43faf56c14..2681476364b0 100644 --- a/src/pages/workspace/WorkspaceInitialPage.js +++ b/src/pages/workspace/WorkspaceInitialPage.js @@ -120,21 +120,7 @@ class WorkspaceInitialPage extends React.Component { shouldShowBackButton onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS)} onCloseButtonPress={() => Navigation.dismissModal()} - shouldShowThreeDotsButton - shouldShowGetAssistanceButton guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_INITIAL} - threeDotsMenuItems={[ - { - icon: Expensicons.Plus, - text: this.props.translate('workspace.new.newWorkspace'), - onSelected: () => PolicyActions.createAndNavigate(), - }, { - icon: Expensicons.Trashcan, - text: this.props.translate('workspace.common.delete'), - onSelected: () => this.setState({isDeleteModalOpen: true}), - }, - ]} - threeDotsAnchorPosition={styles.threeDotsPopoverOffset} />