Skip to content

Commit a88fdd7

Browse files
committed
Merge branch 'main' into fix/67103-remove-getReportNameValuePairs-part-6
2 parents 0240661 + 4560ae0 commit a88fdd7

123 files changed

Lines changed: 1206 additions & 828 deletions

File tree

Some content is hidden

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

.github/workflows/testBuild.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,8 @@ jobs:
352352
ANDROID_UPLOAD_KEYSTORE_PASSWORD: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEYSTORE_PASSWORD }}
353353
ANDROID_UPLOAD_KEYSTORE_ALIAS: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEYSTORE_ALIAS }}
354354
ANDROID_UPLOAD_KEY_PASSWORD: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEY_PASSWORD }}
355+
GITHUB_ACTOR: ${{ github.actor }}
356+
GITHUB_TOKEN: ${{ github.token }}
355357
run: bundle exec fastlane android build_adhoc_hybrid
356358

357359
- name: Configure AWS Credentials

Mobile-Expensify

__mocks__/react-native-localize.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// use a provided translation, or return undefined to test your fallback
2-
const findBestAvailableLanguage = () => ({
2+
const findBestLanguageTag = () => ({
33
languageTag: 'en',
44
isRTL: false,
55
});
66

77
// eslint-disable-next-line import/prefer-default-export
8-
export {findBestAvailableLanguage};
8+
export {findBestLanguageTag};

assets/images/avatars/user/custom-avatars/season-f1/car-blue100.svg

Lines changed: 1 addition & 1 deletion
Loading

assets/images/avatars/user/custom-avatars/season-f1/car-green100.svg

Lines changed: 1 addition & 1 deletion
Loading

assets/images/avatars/user/custom-avatars/season-f1/car-ice100.svg

Lines changed: 1 addition & 1 deletion
Loading

assets/images/avatars/user/custom-avatars/season-f1/car-pink100.svg

Lines changed: 1 addition & 1 deletion
Loading

assets/images/avatars/user/custom-avatars/season-f1/car-tangerine100.svg

Lines changed: 1 addition & 1 deletion
Loading

assets/images/avatars/user/custom-avatars/season-f1/car-yellow100.svg

Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)