Merge branch 'main' into fix/42539

.github/workflows/platformDeploy.yml

@@ -97,7 +97,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: android-sourcemap
-          path: android/app/build/generated/sourcemaps/react/release/*.map
+          path: android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map
 
       - name: Upload Android version to GitHub artifacts
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}

android/app/build.gradle

@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001048400
-        versionName "1.4.84-0"
+        versionCode 1001048402
+        versionName "1.4.84-2"
         // 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"

android/build.gradle

@@ -29,7 +29,7 @@ buildscript {
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
         classpath("com.google.firebase:perf-plugin:1.4.1")
         // Fullstory integration
-        classpath ("com.fullstory:gradle-plugin-local:1.47.0")
+        classpath ("com.fullstory:gradle-plugin-local:1.49.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

babel.config.js

@@ -10,8 +10,13 @@ const defaultPlugins = [
     '@babel/transform-runtime',
     '@babel/plugin-proposal-class-properties',
 
-    // This will serve to map the classes correctly in FullStory
-    '@fullstory/babel-plugin-annotate-react',
+    [
+        '@fullstory/babel-plugin-annotate-react',
+        {
+            'react-native-web': true,
+            native: true,
+        },
+    ],
 
     // We use `transform-class-properties` for transforming ReactNative libraries and do not use it for our own
     // source code transformation as we do not use class property assignment.
@@ -45,7 +50,6 @@ const metro = {
             '@fullstory/babel-plugin-annotate-react',
             {
                 native: true,
-                setFSTagName: true,
             },
         ],
 

ios/.xcode.env

@@ -9,3 +9,8 @@
 # For example, to use nvm with brew, add the following line
 # . "$(brew --prefix nvm)/nvm.sh" --no-use
 export NODE_BINARY=$(command -v node)
+
+# Provide a sourcemap path so that in release builds a source map file will be
+# created at the specified location.
+# (RN's default behaviour on iOS is to skip creating a sourcemap file):
+export SOURCEMAP_FILE="$(pwd)/../main.jsbundle.map";

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.84.0</string>
+	<string>1.4.84.2</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.84.0</string>
+	<string>1.4.84.2</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.84</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.84.0</string>
+	<string>1.4.84.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/Podfile

@@ -118,4 +118,4 @@ target 'NotificationServiceExtension' do
   pod 'AirshipServiceExtension'
 end
 
-pod 'FullStory', :http => 'https://ios-releases.fullstory.com/fullstory-1.48.0-xcframework.tar.gz'
+pod 'FullStory', :http => 'https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz'

ios/Podfile.lock

@@ -138,7 +138,7 @@ PODS:
     - GoogleUtilities/Environment (~> 7.7)
     - "GoogleUtilities/NSData+zlib (~> 7.7)"
   - fmt (6.2.1)
-  - FullStory (1.48.0)
+  - FullStory (1.49.0)
   - fullstory_react-native (1.4.2):
     - FullStory (~> 1.14)
     - glog
@@ -1852,7 +1852,7 @@ PODS:
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
     - React-Core
-  - RNLiveMarkdown (0.1.83):
+  - RNLiveMarkdown (0.1.84):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -1870,9 +1870,9 @@ PODS:
     - React-utils
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNLiveMarkdown/common (= 0.1.83)
+    - RNLiveMarkdown/common (= 0.1.84)
     - Yoga
-  - RNLiveMarkdown/common (0.1.83):
+  - RNLiveMarkdown/common (0.1.84):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -2098,7 +2098,7 @@ DEPENDENCIES:
   - ExpoImageManipulator (from `../node_modules/expo-image-manipulator/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
-  - "FullStory (from `{:http=>\"https://ios-releases.fullstory.com/fullstory-1.48.0-xcframework.tar.gz\"}`)"
+  - "FullStory (from `{:http=>\"https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz\"}`)"
   - "fullstory_react-native (from `../node_modules/@fullstory/react-native`)"
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
@@ -2263,7 +2263,7 @@ EXTERNAL SOURCES:
   FBLazyVector:
     :path: "../node_modules/react-native/Libraries/FBLazyVector"
   FullStory:
-    :http: https://ios-releases.fullstory.com/fullstory-1.48.0-xcframework.tar.gz
+    :http: https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz
   fullstory_react-native:
     :path: "../node_modules/@fullstory/react-native"
   glog:
@@ -2458,7 +2458,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   FullStory:
-    :http: https://ios-releases.fullstory.com/fullstory-1.48.0-xcframework.tar.gz
+    :http: https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz
 
 SPEC CHECKSUMS:
   Airship: 5a6d3f8a982398940b0d48423bb9b8736717c123
@@ -2485,7 +2485,7 @@ SPEC CHECKSUMS:
   FirebasePerformance: 0c01a7a496657d7cea86d40c0b1725259d164c6c
   FirebaseRemoteConfig: 2d6e2cfdb49af79535c8af8a80a4a5009038ec2b
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  FullStory: 097347c823c21c655ca25fd8d5e6355a9326ec54
+  FullStory: c95f74445f871bc344cdc4a4e4ece61b5554e55d
   fullstory_react-native: 6cba8a2c054374a24a44dc4310407d9435459cae
   glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   GoogleAppMeasurement: 5ba1164e3c844ba84272555e916d0a6d3d977e91
@@ -2589,7 +2589,7 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 74b7b3d06d667ba0bbf41da7718f2607ae0dfe8f
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
-  RNLiveMarkdown: 88030b7d9a31f5f6e67743df48ad952d64513b4a
+  RNLiveMarkdown: bf516c02a4549a059829a3fbb8f51c2e0a3110e7
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: df8fe93dbd251f25022f4023d31bc04160d4d65c
   RNPermissions: 0b61d30d21acbeafe25baaa47d9bae40a0c65216
@@ -2606,8 +2606,8 @@ SPEC CHECKSUMS:
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2
   VisionCamera: 1394a316c7add37e619c48d7aa40b38b954bf055
-  Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70
+  Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312
 
-PODFILE CHECKSUM: 66a5c97ae1059e4da1993a4ad95abe5d819f555b
+PODFILE CHECKSUM: d5e281e5370cb0211a104efd90eb5fa7af936e14
 
 COCOAPODS: 1.13.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.84-0",
+  "version": "1.4.84-2",
   "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.",
@@ -65,13 +65,14 @@
     "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@dotlottie/react-player": "^1.6.3",
-    "@expensify/react-native-live-markdown": "0.1.83",
+    "@expensify/react-native-live-markdown": "0.1.84",
     "@expo/metro-runtime": "~3.1.1",
     "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-listformat": "^7.2.2",
     "@formatjs/intl-locale": "^3.3.0",
     "@formatjs/intl-numberformat": "^8.5.0",
     "@formatjs/intl-pluralrules": "^5.2.2",
+    "@fullstory/babel-plugin-annotate-react": "github:fullstorydev/fullstory-babel-plugin-annotate-react#ryanwang/react-native-web-demo",
     "@fullstory/babel-plugin-react-native": "^1.2.1",
     "@fullstory/browser": "^2.0.3",
     "@fullstory/react-native": "^1.4.2",
@@ -155,7 +156,7 @@
     "react-native-linear-gradient": "^2.8.1",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "2.0.48",
+    "react-native-onyx": "2.0.49",
     "react-native-pager-view": "6.2.3",
     "react-native-pdf": "6.7.3",
     "react-native-performance": "^5.1.0",

src/CONST.ts

@@ -523,6 +523,16 @@ const CONST = {
             shortcutKey: 'Tab',
             modifiers: [],
         },
+        DEBUG: {
+            descriptionKey: 'openDebug',
+            shortcutKey: 'D',
+            modifiers: ['CTRL'],
+            trigger: {
+                DEFAULT: {input: 'd', modifierFlags: keyModifierControl},
+                [PLATFORM_OS_MACOS]: {input: 'd', modifierFlags: keyModifierCommand},
+                [PLATFORM_IOS]: {input: 'd', modifierFlags: keyModifierCommand},
+            },
+        },
     },
     KEYBOARD_SHORTCUTS_TYPES: {
         NAVIGATION_SHORTCUT: KEYBOARD_SHORTCUT_NAVIGATION_TYPE,
@@ -3309,6 +3319,11 @@ const CONST = {
 
     CONCIERGE_TRAVEL_URL: 'https://community.expensify.com/discussion/7066/introducing-concierge-travel',
     BOOK_TRAVEL_DEMO_URL: 'https://calendly.com/d/ck2z-xsh-q97/expensify-travel-demo-travel-page',
+    TRAVEL_DOT_URL: 'https://travel.expensify.com',
+    STAGING_TRAVEL_DOT_URL: 'https://staging.travel.expensify.com',
+    TRIP_ID_PATH: (tripID: string) => `trips/${tripID}`,
+    SPOTNANA_TMC_ID: '8e8e7258-1cf3-48c0-9cd1-fe78a6e31eed',
+    STAGING_SPOTNANA_TMC_ID: '7a290c6e-5328-4107-aff6-e48765845b81',
     SCREEN_READER_STATES: {
         ALL: 'all',
         ACTIVE: 'active',

src/components/ClientSideLoggingToolMenu/index.android.tsx

@@ -1,47 +1,10 @@
-import React, {useState} from 'react';
-import RNFetchBlob from 'react-native-blob-util';
-import Share from 'react-native-share';
-import type {Log} from '@libs/Console';
-import localFileCreate from '@libs/localFileCreate';
-import CONST from '@src/CONST';
-import BaseClientSideLoggingToolMenu from './BaseClientSideLoggingToolMenu';
-
+/**
+ * Since client-side logging is currently supported on web and desktop natively right now,
+ * this menu will be hidden in iOS and Android.
+ * See comment here: https://github.com/Expensify/App/issues/43256#issuecomment-2154610196
+ */
 function ClientSideLoggingToolMenu() {
-    const [file, setFile] = useState<{path: string; newFileName: string; size: number}>();
-
-    const createAndSaveFile = (logs: Log[]) => {
-        localFileCreate('logs', JSON.stringify(logs, null, 2)).then((localFile) => {
-            RNFetchBlob.MediaCollection.copyToMediaStore(
-                {
-                    name: localFile.newFileName,
-                    parentFolder: '',
-                    mimeType: 'text/plain',
-                },
-                'Download',
-                localFile.path,
-            );
-            setFile(localFile);
-        });
-    };
-
-    const shareLogs = () => {
-        if (!file) {
-            return;
-        }
-        Share.open({
-            url: `file://${file.path}`,
-        });
-    };
-
-    return (
-        <BaseClientSideLoggingToolMenu
-            file={file}
-            onEnableLogging={() => setFile(undefined)}
-            onDisableLogging={createAndSaveFile}
-            onShareLogs={shareLogs}
-            displayPath={`${CONST.DOWNLOADS_PATH}/${file?.newFileName ?? ''}`}
-        />
-    );
+    return null;
 }
 
 ClientSideLoggingToolMenu.displayName = 'ClientSideLoggingToolMenu';