Skip to content

Commit a973066

Browse files
Krishna2323Krishna2323
authored
Merge branch 'Expensify:main' into krishna2323/issue/61751
2 parents 86dbb5a + 74fc9b9 commit a973066

153 files changed

Lines changed: 2725 additions & 1574 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/actionlint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ self-hosted-runner:
1010
paths:
1111
'**/*':
1212
ignore:
13-
# This is meant to be a temporary workaround for a bug in actionslint. Upstream:
13+
# This is meant to be a temporary workaround for a bug in actionlint. Upstream:
1414
# - issue: https://github.com/rhysd/actionlint/issues/511
1515
# - PR: https://github.com/rhysd/actionlint/pull/513
1616
- '"env" is not allowed in "runs" section because .* is a Composite action.*'

‎.github/actions/javascript/postTestBuildComment/index.js‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11515,11 +11515,21 @@ function getTestBuildMessage(appPr, mobileExpensifyPr) {
1151511515
acc[platform] = { link: 'N/A', qrCode: 'N/A' };
1151611516
return acc;
1151711517
}
11518-
const isSuccess = input === 'success';
11519-
const link = isSuccess ? core.getInput(`${platform}_LINK`) : '❌ FAILED ❌';
11520-
const qrCode = isSuccess
11521-
? `![${names[platform]}](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${link})`
11522-
: `The QR code can't be generated, because the ${names[platform]} build failed`;
11518+
let link = '';
11519+
let qrCode = '';
11520+
switch (input) {
11521+
case 'success':
11522+
link = core.getInput(`${platform}_LINK`);
11523+
qrCode = `![${names[platform]}](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${link})`;
11524+
break;
11525+
case 'skipped':
11526+
link = '⏩ SKIPPED ⏩';
11527+
qrCode = `The build for ${names[platform]} was skipped`;
11528+
break;
11529+
default:
11530+
link = '❌ FAILED ❌';
11531+
qrCode = `The QR code can't be generated, because the ${names[platform]} build failed`;
11532+
}
1152311533
acc[platform] = {
1152411534
link,
1152511535
qrCode,
@@ -11532,12 +11542,12 @@ Built from${appPr ? ` App PR Expensify/App#${appPr}` : ''}${mobileExpensifyPr ?
1153211542
| ------------- | ------------- |
1153311543
| ${result.ANDROID.link} | ${result.IOS.link} |
1153411544
| ${result.ANDROID.qrCode} | ${result.IOS.qrCode} |
11535-
${appPr
11536-
? `\n| Desktop :computer: | Web :spider_web: |
11545+
11546+
| Desktop :computer: | Web :spider_web: |
1153711547
| ------------- | ------------- |
1153811548
| ${result.DESKTOP.link} | ${result.WEB.link} |
11539-
| ${result.DESKTOP.qrCode} | ${result.WEB.qrCode} |\n`
11540-
: ''}
11549+
| ${result.DESKTOP.qrCode} | ${result.WEB.qrCode} |
11550+
1154111551
---
1154211552

1154311553
:eyes: [View the workflow run that generated this build](https://github.com/${github_1.context.repo.owner}/${github_1.context.repo.repo}/actions/runs/${github_1.context.runId}) :eyes:

‎.github/actions/javascript/postTestBuildComment/postTestBuildComment.ts‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,21 @@ function getTestBuildMessage(appPr?: number, mobileExpensifyPr?: number): string
2222
return acc;
2323
}
2424

25-
const isSuccess = input === 'success';
26-
27-
const link = isSuccess ? core.getInput(`${platform}_LINK`) : '❌ FAILED ❌';
28-
const qrCode = isSuccess
29-
? `![${names[platform]}](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${link})`
30-
: `The QR code can't be generated, because the ${names[platform]} build failed`;
25+
let link = '';
26+
let qrCode = '';
27+
switch (input) {
28+
case 'success':
29+
link = core.getInput(`${platform}_LINK`);
30+
qrCode = `![${names[platform]}](https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${link})`;
31+
break;
32+
case 'skipped':
33+
link = '⏩ SKIPPED ⏩';
34+
qrCode = `The build for ${names[platform]} was skipped`;
35+
break;
36+
default:
37+
link = '❌ FAILED ❌';
38+
qrCode = `The QR code can't be generated, because the ${names[platform]} build failed`;
39+
}
3140

3241
acc[platform] = {
3342
link,
@@ -44,14 +53,12 @@ Built from${appPr ? ` App PR Expensify/App#${appPr}` : ''}${mobileExpensifyPr ?
4453
| ------------- | ------------- |
4554
| ${result.ANDROID.link} | ${result.IOS.link} |
4655
| ${result.ANDROID.qrCode} | ${result.IOS.qrCode} |
47-
${
48-
appPr
49-
? `\n| Desktop :computer: | Web :spider_web: |
56+
57+
| Desktop :computer: | Web :spider_web: |
5058
| ------------- | ------------- |
5159
| ${result.DESKTOP.link} | ${result.WEB.link} |
52-
| ${result.DESKTOP.qrCode} | ${result.WEB.qrCode} |\n`
53-
: ''
54-
}
60+
| ${result.DESKTOP.qrCode} | ${result.WEB.qrCode} |
61+
5562
---
5663
5764
:eyes: [View the workflow run that generated this build](https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}) :eyes:

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ jobs:
273273
attachments: [{
274274
color: "#DB4545",
275275
pretext: `<!subteam^S4TJJ3PSL>`,
276-
text: `💥 Android HybridApp production <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|deploy run> failed. Please <https://stackoverflowteams.com/c/expensify/questions/5738|manually submit> ${{ needs.prep.outputs.APP_VERSION }} in the <https://play.google.com/console/u/0/developers/8765590895836334604/app/4974129597497161901/releases/overview|Google Play Store>. 💥 But first check the workflow, it's likely that the release was successful and <https://github.com/Expensify/Expensify/issues/488492|this error> is occuring)`,
276+
text: `💥 Android HybridApp production <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|deploy run> failed. Please <https://stackoverflowteams.com/c/expensify/questions/5738|manually submit> ${{ needs.prep.outputs.APP_VERSION }} in the <https://play.google.com/console/u/0/developers/8765590895836334604/app/4974129597497161901/releases/overview|Google Play Store> 💥`,
277277
}]
278278
}
279279
env:

‎.github/workflows/testBuild.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
outputs:
8181
MOBILE_EXPENSIFY_PR: ${{ steps.mobileExpensifyPR.outputs.result }}
8282
steps:
83-
- name: Check if author specifed Expensify/Mobile-Expensify PR
83+
- name: Check if author specified Expensify/Mobile-Expensify PR
8484
id: mobileExpensifyPR
8585
# v7
8686
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea

‎Mobile-Expensify‎

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009016003
118-
versionName "9.1.60-3"
117+
versionCode 1009016301
118+
versionName "9.1.63-1"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

‎assets/images/emptystate__spy-pigeon.svg‎

Lines changed: 121 additions & 0 deletions
Loading

‎assets/images/user-lock.svg‎

Lines changed: 15 additions & 0 deletions
Loading

‎config/webpack/webpack.common.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ const includeModules = [
4343
'expo-av',
4444
'expo-image-manipulator',
4545
'expo-modules-core',
46-
'react-native-webrtc-web-shim',
4746
].join('|');
4847

4948
const environmentToLogoSuffixMap: Record<string, string> = {

0 commit comments

Comments
 (0)