Skip to content

Commit 9a2c433

Browse files
KJ21-ENGKJ21-ENG
committed
Merge remote-tracking branch 'upstream/main' into KJ21-ENG/90933-admin-invite-onboarding-v3
# Conflicts: # src/libs/actions/Report/index.ts
2 parents e8cfccb + 1e8a04c commit 9a2c433

406 files changed

Lines changed: 11907 additions & 5932 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/buildAdHoc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
owner: context.repo.owner,
5555
repo: context.repo.repo,
5656
issue_number: ${{ inputs.APP_PR_NUMBER || 0 }},
57-
body: `🚧 @${{ github.actor }} has triggered a test Expensify/App build. You can view the [workflow run here](${workflowURL}).`
57+
body: `🚧 ${{ github.actor }} has triggered a test Expensify/App build. You can view the [workflow run here](${workflowURL}).`
5858
});
5959
6060
- name: Add build start comment to Expensify/Mobile-Expensify PR
@@ -69,7 +69,7 @@ jobs:
6969
owner: context.repo.owner,
7070
repo: 'Mobile-Expensify',
7171
issue_number: ${{ inputs.MOBILE_EXPENSIFY_PR || 0 }},
72-
body: `🚧 @${{ github.actor }} has triggered a test Expensify/Mobile-Expensify build. You can view the [workflow run here](${workflowURL}).`
72+
body: `🚧 ${{ github.actor }} has triggered a test Expensify/Mobile-Expensify build. You can view the [workflow run here](${workflowURL}).`
7373
});
7474
7575
buildAndroid:

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,8 @@ jobs:
533533
- name: Submit previous production build to 100%
534534
run: bundle exec fastlane ios complete_hybrid_rollout
535535
continue-on-error: true
536+
env:
537+
APPLE_ID: ${{ vars.APPLE_ID }}
536538

537539
- name: Submit production build for App Store review and a slow rollout
538540
run: bundle exec fastlane ios submit_hybrid_for_rollout

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# Per-shard key: each shard only instruments the ~1/8 of suites it runs, so a single
4040
# shared key freezes one shard's partial cache for all shards. The hash refreshes the
4141
# cache when dependencies or Babel config change; restore-keys warms it in between.
42-
key: ${{ runner.os }}-jest-${{ matrix.chunk }}-${{ hashFiles('package-lock.json', 'babel.config.js') }}
42+
key: ${{ runner.os }}-jest-${{ matrix.chunk }}-${{ hashFiles('package-lock.json', 'patches/**', 'babel.config.js') }}
4343
restore-keys: ${{ runner.os }}-jest-${{ matrix.chunk }}-
4444

4545
- name: Jest tests

‎.github/workflows/validateMobileExpensifySubmodule.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ jobs:
2121
repository: Expensify/Mobile-Expensify
2222
path: .github/mobile-expensify-repo
2323
token: ${{ secrets.OS_BOTIFY_TOKEN }}
24+
# We only read the default-branch HEAD SHA (git rev-parse HEAD), never file contents,
25+
# so skip downloading blobs and check out only the repo root to avoid materializing the tree.
26+
filter: blob:none
27+
sparse-checkout: .
28+
sparse-checkout-cone-mode: false
2429

2530
- name: Validate submodule pointer
2631
env:

‎.storybook/fonts.css‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,56 @@
22
font-family: Expensify Neue;
33
font-weight: 400;
44
font-style: normal;
5-
src: url('../assets/fonts/web/ExpensifyNeue-Regular.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-Regular.woff') format('woff');
5+
src: url('../assets/fonts/web/ExpensifyNeue-Regular.woff2') format('woff2');
66
}
77

88
@font-face {
99
font-family: Expensify Neue;
1010
font-weight: 700;
1111
font-style: normal;
12-
src: url('../assets/fonts/web/ExpensifyNeue-Bold.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-Bold.woff') format('woff');
12+
src: url('../assets/fonts/web/ExpensifyNeue-Bold.woff2') format('woff2');
1313
}
1414

1515
@font-face {
1616
font-family: Expensify Neue;
1717
font-weight: 400;
1818
font-style: italic;
19-
src: url('../assets/fonts/web/ExpensifyNeue-Italic.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-Italic.woff') format('woff');
19+
src: url('../assets/fonts/web/ExpensifyNeue-Italic.woff2') format('woff2');
2020
}
2121

2222
@font-face {
2323
font-family: Expensify Neue;
2424
font-weight: 700;
2525
font-style: italic;
26-
src: url('../assets/fonts/web/ExpensifyNeue-BoldItalic.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-BoldItalic.woff') format('woff');
26+
src: url('../assets/fonts/web/ExpensifyNeue-BoldItalic.woff2') format('woff2');
2727
}
2828

2929
@font-face {
3030
font-family: Expensify Mono;
3131
font-weight: 400;
3232
font-style: normal;
33-
src: url('../assets/fonts/web/ExpensifyMono-Regular.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyMono-Regular.woff') format('woff');
33+
src: url('../assets/fonts/web/ExpensifyMono-Regular.woff2') format('woff2');
3434
}
3535

3636
@font-face {
3737
font-family: Expensify Mono;
3838
font-weight: 700;
3939
font-style: normal;
40-
src: url('../assets/fonts/web/ExpensifyMono-Bold.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyMono-Bold.woff') format('woff');
40+
src: url('../assets/fonts/web/ExpensifyMono-Bold.woff2') format('woff2');
4141
}
4242

4343
@font-face {
4444
font-family: Expensify New Kansas;
4545
font-weight: 500;
4646
font-style: normal;
47-
src: url('../assets/fonts/web/ExpensifyNewKansas-Medium.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNewKansas-Medium.woff') format('woff');
47+
src: url('../assets/fonts/web/ExpensifyNewKansas-Medium.woff2') format('woff2');
4848
}
4949

5050
@font-face {
5151
font-family: Expensify New Kansas;
5252
font-weight: 500;
5353
font-style: italic;
54-
src: url('../assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff') format('woff');
54+
src: url('../assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff2') format('woff2');
5555
}
5656

5757
* {

‎Mobile-Expensify‎

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009041602
115-
versionName "9.4.16-2"
114+
versionCode 1009041703
115+
versionName "9.4.17-3"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

‎assets/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Fonts
44

5-
All fonts used by web and native apps are located inside `assets/fonts/` folder. The native app will use fonts with `.otf` or `.ttf` formats, where the web app will use fonts with `.otf`, `.ttf`, `.woff` or `.woff2` formats.
5+
All fonts used by web and native apps are located inside `assets/fonts/` folder. The native app will use fonts with `.otf` or `.ttf` formats, where the web app will use fonts with `.otf`, `.ttf` or `.woff2` formats.
66

77
### Adding / Removing fonts
88

@@ -77,7 +77,7 @@ To add or remove a font used in the web app:
7777
font-family: <new_font_family>;
7878
font-weight: 500;
7979
font-style: normal;
80-
src: url('/fonts/<font-family-file>.woff2') format('woff2'), url('/fonts/<font-family-file>.woff') format('woff');
80+
src: url('/fonts/<font-family-file>.woff2') format('woff2');
8181
}
8282
/* Add the other variants too. */
8383
```
@@ -100,7 +100,7 @@ To add or remove a font used in the storybook web app:
100100
font-family: <new_font_family>;
101101
font-weight: 500;
102102
font-style: normal;
103-
src: url('../assets/fonts/web/<font-family-file>.woff2') format('woff2'), url('../assets/fonts/web/<font-family-file>.woff') format('woff');
103+
src: url('../assets/fonts/web/<font-family-file>.woff2') format('woff2');
104104
}
105105
/* Add the other variants too. */
106106
```
@@ -121,7 +121,7 @@ To add or remove a font used in the Expensify Help web app:
121121
font-family: <new_font_family>;
122122
font-weight: 500;
123123
font-style: normal;
124-
src: url('/assets/fonts/<font-family-file>.woff2') format('woff2'), url('/assets/fonts/<font-family-file>.woff') format('woff');
124+
src: url('/assets/fonts/<font-family-file>.woff2') format('woff2');
125125
}
126126
/* Add the other variants too. */
127127
```

‎assets/css/fonts.css‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,70 +2,70 @@
22
font-family: Expensify Neue;
33
font-weight: 400;
44
font-style: normal;
5-
src: url('/fonts/ExpensifyNeue-Regular.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Regular.woff') format('woff');
5+
src: url('/fonts/ExpensifyNeue-Regular.woff2') format('woff2');
66
}
77

88
@font-face {
99
font-family: Expensify Neue;
1010
font-weight: 700;
1111
font-style: normal;
12-
src: url('/fonts/ExpensifyNeue-Bold.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Bold.woff') format('woff');
12+
src: url('/fonts/ExpensifyNeue-Bold.woff2') format('woff2');
1313
}
1414

1515
@font-face {
1616
font-family: Expensify Neue;
1717
font-weight: 400;
1818
font-style: italic;
19-
src: url('/fonts/ExpensifyNeue-Italic.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Italic.woff') format('woff');
19+
src: url('/fonts/ExpensifyNeue-Italic.woff2') format('woff2');
2020
}
2121

2222
@font-face {
2323
font-family: Expensify Neue;
2424
font-weight: 700;
2525
font-style: italic;
26-
src: url('/fonts/ExpensifyNeue-BoldItalic.woff2') format('woff2'), url('/fonts/ExpensifyNeue-BoldItalic.woff') format('woff');
26+
src: url('/fonts/ExpensifyNeue-BoldItalic.woff2') format('woff2');
2727
}
2828

2929
@font-face {
3030
font-family: Expensify Mono;
3131
font-weight: 400;
3232
font-style: normal;
33-
src: url('/fonts/ExpensifyMono-Regular.woff2') format('woff2'), url('/fonts/ExpensifyMono-Regular.woff') format('woff');
33+
src: url('/fonts/ExpensifyMono-Regular.woff2') format('woff2');
3434
}
3535

3636
@font-face {
3737
font-family: Expensify Mono;
3838
font-weight: 700;
3939
font-style: normal;
40-
src: url('/fonts/ExpensifyMono-Bold.woff2') format('woff2'), url('/fonts/ExpensifyMono-Bold.woff') format('woff');
40+
src: url('/fonts/ExpensifyMono-Bold.woff2') format('woff2');
4141
}
4242

4343
@font-face {
4444
font-family: Expensify Mono;
4545
font-weight: 400;
4646
font-style: italic;
47-
src: url('/fonts/ExpensifyMono-Italic.woff2') format('woff2'), url('/fonts/ExpensifyMono-Italic.woff') format('woff');
47+
src: url('/fonts/ExpensifyMono-Italic.woff2') format('woff2');
4848
}
4949

5050
@font-face {
5151
font-family: Expensify Mono;
5252
font-weight: 700;
5353
font-style: italic;
54-
src: url('/fonts/ExpensifyMono-BoldItalic.woff2') format('woff2'), url('/fonts/ExpensifyMono-BoldItalic.woff') format('woff');
54+
src: url('/fonts/ExpensifyMono-BoldItalic.woff2') format('woff2');
5555
}
5656

5757
@font-face {
5858
font-family: Expensify New Kansas;
5959
font-weight: 500;
6060
font-style: normal;
61-
src: url('/fonts/ExpensifyNewKansas-Medium.woff2') format('woff2'), url('/fonts/ExpensifyNewKansas-Medium.woff') format('woff');
61+
src: url('/fonts/ExpensifyNewKansas-Medium.woff2') format('woff2');
6262
}
6363

6464
@font-face {
6565
font-family: Expensify New Kansas;
6666
font-weight: 500;
6767
font-style: italic;
68-
src: url('/fonts/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'), url('/fonts/ExpensifyNewKansas-MediumItalic.woff') format('woff');
68+
src: url('/fonts/ExpensifyNewKansas-MediumItalic.woff2') format('woff2');
6969
}
7070

7171
@font-face {

0 commit comments

Comments
 (0)