Skip to content

Commit 6284cb8

Browse files
committed
Merge branch 'main' of https://github.com/wildan-m/App into wildan/fix/50562-fix-list-not-scrolled-up-when-query-empty
2 parents 885a7b3 + 4f3fdcd commit 6284cb8

File tree

215 files changed

+5215
-2226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+5215
-2226
lines changed

.env.example

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ONYX_METRICS=false
1414
USE_THIRD_PARTY_SCRIPTS=false
1515

1616
EXPENSIFY_ACCOUNT_ID_ACCOUNTING=-1
17+
EXPENSIFY_ACCOUNT_ID_ACCOUNTS_PAYABLE=-1
1718
EXPENSIFY_ACCOUNT_ID_ADMIN=-1
1819
EXPENSIFY_ACCOUNT_ID_BILLS=-1
1920
EXPENSIFY_ACCOUNT_ID_CHRONOS=-1

.github/workflows/androidBump.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Android Rollout Bumper
22

33
on:
4+
workflow_dispatch:
45
schedule:
56
# Runs at midnight every day
67
- cron: '0 0 * * *'

.github/workflows/buildAndroid.yml

-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ jobs:
5454
build:
5555
name: Build Android app
5656
runs-on: ubuntu-latest-xl
57-
env:
58-
RUBYOPT: '-rostruct'
5957
outputs:
6058
AAB_FILE_NAME: ${{ steps.build.outputs.AAB_FILE_NAME }}
6159
APK_FILE_NAME: ${{ steps.build.outputs.APK_FILE_NAME }}

.github/workflows/deploy.yml

-6
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ jobs:
8181
name: Upload Android build to Google Play Store
8282
needs: buildAndroid
8383
runs-on: ubuntu-latest
84-
env:
85-
RUBYOPT: '-rostruct'
8684
steps:
8785
- name: Checkout
8886
uses: actions/checkout@v4
@@ -121,8 +119,6 @@ jobs:
121119
needs: prep
122120
if: ${{ github.ref == 'refs/heads/production' }}
123121
runs-on: ubuntu-latest
124-
env:
125-
RUBYOPT: '-rostruct'
126122
steps:
127123
- name: Checkout
128124
uses: actions/checkout@v4
@@ -170,8 +166,6 @@ jobs:
170166
defaults:
171167
run:
172168
working-directory: Mobile-Expensify/react-native
173-
env:
174-
RUBYOPT: '-rostruct'
175169
steps:
176170
- name: Checkout
177171
uses: actions/checkout@v4

.github/workflows/testBuild.yml

+18-2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,24 @@ jobs:
6060
env:
6161
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6262

63+
postGitHubCommentBuildStarted:
64+
runs-on: ubuntu-latest
65+
needs: [validateActor, getBranchRef]
66+
if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
67+
steps:
68+
- name: Add build start comment
69+
uses: actions/github-script@v7
70+
with:
71+
github-token: ${{ github.token }}
72+
script: |
73+
const workflowURL = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
74+
github.rest.issues.createComment({
75+
owner: context.repo.owner,
76+
repo: context.repo.repo,
77+
issue_number: process.env.PULL_REQUEST_NUMBER,
78+
body: `🚧 @${{ github.actor }} has triggered a test build. You can view the [workflow run here](${workflowURL}).`
79+
});
80+
6381
buildAndroid:
6482
name: Build Android app for testing
6583
uses: ./.github/workflows/buildAndroid.yml
@@ -75,8 +93,6 @@ jobs:
7593
name: Upload Android app to S3
7694
needs: [buildAndroid]
7795
runs-on: ubuntu-latest
78-
env:
79-
RUBYOPT: '-rostruct'
8096
outputs:
8197
S3_APK_PATH: ${{ steps.exportS3Path.outputs.S3_APK_PATH }}
8298
steps:

android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ android {
110110
minSdkVersion rootProject.ext.minSdkVersion
111111
targetSdkVersion rootProject.ext.targetSdkVersion
112112
multiDexEnabled rootProject.ext.multiDexEnabled
113-
versionCode 1009006204
114-
versionName "9.0.62-4"
113+
versionCode 1009006402
114+
versionName "9.0.64-2"
115115
// Supported language variants must be declared here to avoid from being removed during the compilation.
116116
// This also helps us to not include unnecessary language variants in the APK.
117117
resConfigs "en", "es"
Loading

contributingGuides/PERFORMANCE_METRICS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Project is using Firebase for tracking these metrics. However, not all of them a
1414
| `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. |
1515
| `_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. |
1616
| `_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. |
17-
| `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. |
17+
| `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. |
1818
| `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. |
1919
| `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. |
2020
| `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. |

contributingGuides/STORYBOOK.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export {
6262

6363
That will give us an interactive playground to test out various component attributes with the defaults we passed.
6464

65-
![Storybook example](web/storybook-example.png)
65+
![Storybook example](/web/storybook-example.png)
6666

6767
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`.
6868

0 commit comments

Comments
 (0)