Skip to content

Commit

Permalink
Merge branch 'main' into scroll-highlight
Browse files Browse the repository at this point in the history
  • Loading branch information
shubham1206agra authored Mar 11, 2024
2 parents 1d8ff48 + 7787106 commit a165c49
Show file tree
Hide file tree
Showing 120 changed files with 2,326 additions and 2,133 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/reassurePerformanceTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ jobs:
uses: ./.github/actions/javascript/getGraphiteString

- name: Send graphite data
env:
GRAPHITE_SERVER: ${{ vars.GRAPHITE_SERVER }}
GRAPHITE_PORT: ${{ vars.GRAPHITE_PORT }}
# run only when merged to main
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
run: echo -e "${{ steps.saveGraphiteString.outputs.GRAPHITE_STRING }}" | nc -q0 "$GRAPHITE_SERVER" "$GRAPHITE_PORT"
run: echo -e "${{ steps.saveGraphiteString.outputs.GRAPHITE_STRING }}" | nc -q0 stats.expensify.com 3003
5 changes: 2 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001045001
versionName "1.4.50-1"
versionCode 1001045003
versionName "1.4.50-3"
}

flavorDimensions "default"
Expand Down Expand Up @@ -181,7 +181,6 @@ android {
dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")
implementation("com.facebook.react:flipper-integration")

if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions assets/images/simple-illustrations/simple-illustration__car.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions assets/images/simple-illustrations/simple-illustration__coins.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a165c49

Please sign in to comment.