Merge branch 'main' into revert-52434-revert-PR-51445

Expensify · Nov 19, 2024 · 200a650 · 200a650
2 parents 1dbec4d 2fe1a06
commit 200a650
Show file tree

Hide file tree

Showing 94 changed files with 946 additions and 652 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -110,8  110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009006303
-        versionName "9.0.63-3"
         versionCode 1009006401
         versionName "9.0.64-1"
         // 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/contributingGuides/PERFORMANCE_METRICS.md b/contributingGuides/PERFORMANCE_METRICS.md
@@ -14,7  14,7 @@ Project is using Firebase for tracking these metrics. However, not all of them a
 | `js_loaded`    | ✅ | The time it takes for the JavaScript bundle to load. <br><br>**Platforms:** Android, iOS | **Android:** Starts in the `onCreate` method.<br><br>**iOS:** Starts in the AppDelegate's `didFinishLaunchingWithOptions` method.    | Stops at the first render of the app via native module on the JS side.     |
 | `_app_in_foreground`    | ✅ | The time when the app is running in the foreground and available to the user.<br><br>**Platforms:** Android, iOS     | **Android:** Starts when the first activity to reach the foreground has its `onResume()` method called. <br><br>**iOS:** Starts when the application receives the `UIApplicationDidBecomeActiveNotification` notification.   | **Android:** Stops when the last activity to leave the foreground has its `onStop()` method called. <br><br>**iOS:** Stops when it receives the `UIApplicationWillResignActiveNotification` notification.     |
 | `_app_in_background`    | ✅ | Time when the app is running in the background.<br><br>**Platforms:** Android, iOS    | **Android:** Starts when the last activity to leave the foreground has its `onStop()` method called. <br><br>**iOS:** Starts when the application receives the `UIApplicationWillResignActiveNotification` notification.   | **Android:** Stops when the first activity to reach the foreground has its `onResume()` method called. <br><br>**iOS:** Stops when it receives the `UIApplicationDidBecomeActiveNotification` notification.     |
-| `sidebar_loaded`    | ❌ | Time taken for the Sidebar to load.<br><br>**Platforms:** All      | Starts when the Sidebar is mounted.     | Stops when the LHN finishes laying out.     |
 | `sidebar_loaded`    | ✅ | Time taken for the Sidebar to load.<br><br>**Platforms:** All      | Starts when the Sidebar is mounted.     | Stops when the LHN finishes laying out.     |
 | `calc_most_recent_last_modified_action`    | ✅ | Time taken to find the most recently modified report action or report.<br><br>**Platforms:** All      | Starts when the app reconnects to the network     | Ends when the app reconnects to the network and the most recent report action or report is found.     |
 | `open_search`   | ✅ | Time taken to open up the Search Router.<br><br>**Platforms:** All      | Starts when the Search Router icon in LHN is pressed.     | Stops when the list of available options finishes laying out.     |
 | `load_search_options`    | ✅ | Time taken to generate the list of options used in the Search Router.<br><br>**Platforms:** All     | Starts when the `getSearchOptions` function is called.     | Stops when the list of available options is generated.     |

diff --git a/contributingGuides/STORYBOOK.md b/contributingGuides/STORYBOOK.md
@@ -62,7  62,7 @@ export {
 
 That will give us an interactive playground to test out various component attributes with the defaults we passed.
 
-![Storybook example](web/storybook-example.png)
 ![Storybook example](/web/storybook-example.png)
 
 Note that we did not need to write any of the descriptions for these props. This is because they are automatically generated from a React component's `propTypes`.
 

diff --git a/docs/articles/expensify-classic/spending-insights/Custom-Templates.md b/docs/articles/expensify-classic/spending-insights/Custom-Templates.md
diff --git a/docs/articles/expensify-classic/spending-insights/Default-Export-Templates.md b/docs/articles/expensify-classic/spending-insights/Default-Export-Templates.md