Skip to content

Commit 6519991

Browse files
sumo-sloniksumo-slonik
committed
Merge branch 'main' into feature/kuba_nowakowski/add_switch_animations_to_acounting
# Conflicts: # src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
2 parents ab7e7f2 + a0836a9 commit 6519991

File tree

111 files changed

+1810
-1343
lines changed

Some content is hidden

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

111 files changed

+1810
-1343
lines changed

‎.eslintrc.changed.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,7 @@ module.exports = {
2121
},
2222
overrides: [
2323
{
24-
files: [
25-
'src/libs/actions/IOU.ts',
26-
'src/libs/actions/Report.ts',
27-
'src/pages/workspace/WorkspaceInitialPage.tsx',
28-
'src/pages/home/report/PureReportActionItem.tsx',
29-
'src/libs/SidebarUtils.ts',
30-
],
24+
files: ['src/pages/workspace/WorkspaceInitialPage.tsx', 'src/pages/home/report/PureReportActionItem.tsx', 'src/libs/SidebarUtils.ts'],
3125
rules: {
3226
'rulesdir/no-default-id-values': 'off',
3327
},

‎.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ module.exports = {
134134
{
135135
selector: ['variable', 'property'],
136136
format: ['camelCase', 'UPPER_CASE', 'PascalCase'],
137+
filter: {
138+
regex: '^private_[a-z][a-zA-Z0-9]+$',
139+
match: false,
140+
},
137141
},
138142
{
139143
selector: 'function',

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ $
2222
PROPOSAL:
2323

2424

25+
<!---
26+
If you want to trigger adhoc build of hybrid app from specific Mobile-Expensify PR please specify it like follows:
27+
28+
MOBILE-EXPENSIFY: PR number
29+
30+
--->
31+
2532
### Tests
2633
<!---
2734
Add a numbered list of manual tests you performed that validates your changes work on all platforms, and that there are no regressions present.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18007,6 +18007,11 @@ async function run() {
1800718007
console.log('Comment body is either empty or doesn\'t contain the keyword "Proposal": ', payload.comment?.body);
1800818008
return;
1800918009
}
18010+
// If event is `edited` and comment was already edited by the bot, return early
18011+
if (isCommentEditedEvent(payload) && payload.comment?.body.trim().includes('Edited by **proposal-police**')) {
18012+
console.log('Comment was already edited by proposal-police once.\n', payload.comment?.body);
18013+
return;
18014+
}
1801018015
console.log('ProposalPolice™ Action triggered for comment:', payload.comment?.body);
1801118016
console.log('-> GitHub Action Type: ', payload.action?.toUpperCase());
1801218017
if (!isCommentCreatedEvent(payload) && !isCommentEditedEvent(payload)) {
@@ -18033,12 +18038,7 @@ async function run() {
1803318038
if (isCommentCreatedEvent(payload) && isActionRequired) {
1803418039
const formattedResponse = message
1803518040
// replace {user} from response template with @username
18036-
.replaceAll('{user}', `@${payload.comment?.user.login}`)
18037-
// replace {proposalLink} from response template with the link to the comment
18038-
.replaceAll('{proposalLink}', payload.comment?.html_url)
18039-
// remove any double quotes from the final comment because sometimes the assistant's
18040-
// response contains double quotes / sometimes it doesn't
18041-
.replaceAll('"', '');
18041+
.replaceAll('{user}', `@${payload.comment?.user.login}`);
1804218042
// Create a comment with the assistant's response
1804318043
console.log('ProposalPolice™ commenting on issue...');
1804418044
await GithubUtils_1.default.createComment(CONST_1.default.APP_REPO, github_1.context.issue.number, formattedResponse);

‎.github/actions/javascript/proposalPoliceComment/proposalPoliceComment.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ async function run() {
4141
return;
4242
}
4343

44+
// If event is `edited` and comment was already edited by the bot, return early
45+
if (isCommentEditedEvent(payload) && payload.comment?.body.trim().includes('Edited by **proposal-police**')) {
46+
console.log('Comment was already edited by proposal-police once.\n', payload.comment?.body);
47+
return;
48+
}
49+
4450
console.log('ProposalPolice™ Action triggered for comment:', payload.comment?.body);
4551
console.log('-> GitHub Action Type: ', payload.action?.toUpperCase());
4652

@@ -73,14 +79,7 @@ async function run() {
7379
if (isCommentCreatedEvent(payload) && isActionRequired) {
7480
const formattedResponse = message
7581
// replace {user} from response template with @username
76-
.replaceAll('{user}', `@${payload.comment?.user.login}`)
77-
78-
// replace {proposalLink} from response template with the link to the comment
79-
.replaceAll('{proposalLink}', payload.comment?.html_url)
80-
81-
// remove any double quotes from the final comment because sometimes the assistant's
82-
// response contains double quotes / sometimes it doesn't
83-
.replaceAll('"', '');
82+
.replaceAll('{user}', `@${payload.comment?.user.login}`);
8483

8584
// Create a comment with the assistant's response
8685
console.log('ProposalPolice™ commenting on issue...');

‎.github/workflows/testBuildHybrid.yml

Lines changed: 59 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
name: Build and deploy hybird apps for testing
1+
name: Build and deploy hybrid apps for testing
22

33
on:
44
workflow_dispatch:
55
inputs:
66
PULL_REQUEST_NUMBER:
77
description: Pull Request number for correct placement of apps
88
required: true
9-
OLD_DOT_COMMIT:
10-
description: The branch, tag or SHA to checkout on Old Dot side
11-
required: false
129
pull_request_target:
1310
types: [opened, synchronize, labeled]
1411
branches: ['*ci-test/**']
1512

1613
env:
1714
PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
18-
OLD_DOT_COMMIT: ${{ github.event.inputs.OLD_DOT_COMMIT }}
1915

2016
jobs:
2117
validateActor:
@@ -63,6 +59,48 @@ jobs:
6359
echo "REF=$(gh pr view ${{ github.event.inputs.PULL_REQUEST_NUMBER }} --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
6460
env:
6561
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
62+
63+
getOldDotPR:
64+
runs-on: ubuntu-latest
65+
needs: validateActor
66+
if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
67+
outputs:
68+
OLD_DOT_PR: ${{ steps.old-dot-pr.outputs.result }}
69+
steps:
70+
- name: Check if author specifed Old Dot PR
71+
id: old-dot-pr
72+
uses: actions/github-script@v7
73+
with:
74+
github-token: ${{ github.token }}
75+
result-encoding: string
76+
script: |
77+
const pullRequest = await github.rest.pulls.get({
78+
owner: context.repo.owner,
79+
repo: context.repo.repo,
80+
pull_number: env.PULL_REQUEST_NUMBER,
81+
});
82+
83+
const body = pullRequest.data.body;
84+
const regex = /MOBILE-EXPENSIFY:(?<prNumber>.*)/;
85+
const found = body.match(regex)?.groups?.prNumber || "";
86+
87+
return found.trim();
88+
89+
getOldDotBranchRef:
90+
runs-on: ubuntu-latest
91+
needs: getOldDotPR
92+
if: ${{ needs.getOldDotPR.outputs.OLD_DOT_PR != '' }}
93+
outputs:
94+
OLD_DOT_REF: ${{ steps.getHeadRef.outputs.REF }}
95+
steps:
96+
- name: Check if pull request number is correct
97+
id: getHeadRef
98+
run: |
99+
set -e
100+
echo "REF=$(gh pr view ${{ needs.getOldDotPR.outputs.OLD_DOT_PR }} --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
101+
env:
102+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
103+
66104

67105
postGitHubCommentBuildStarted:
68106
runs-on: ubuntu-latest
@@ -84,7 +122,7 @@ jobs:
84122
85123
androidHybrid:
86124
name: Build Android HybridApp
87-
needs: [validateActor, getBranchRef]
125+
needs: [validateActor, getBranchRef, getOldDotBranchRef]
88126
if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
89127
runs-on: ubuntu-latest-xl
90128
outputs:
@@ -100,15 +138,16 @@ jobs:
100138
fetch-depth: 0
101139

102140
- name: Update submodule to match main
103-
env:
104-
OLD_DOT_COMMIT: ${{ env.OLD_DOT_COMMIT }}
105141
run: |
106142
git submodule update --init --remote
107-
if [[ -z "$OLD_DOT_COMMIT" ]]; then
108-
git fetch
109-
git checkout ${{ env.OLD_DOT_COMMIT }}
110-
fi
111143
144+
- name: Checkout Old Dot to author specified branch or commit
145+
if: ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF != '' }}
146+
run: |
147+
cd Mobile-Expensify
148+
git fetch
149+
git checkout ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF }}
150+
112151
- name: Configure MapBox SDK
113152
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
114153

@@ -194,7 +233,7 @@ jobs:
194233
195234
iosHybrid:
196235
name: Build and deploy iOS for testing
197-
needs: [validateActor, getBranchRef]
236+
needs: [validateActor, getBranchRef, getOldDotBranchRef]
198237
if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
199238
env:
200239
DEVELOPER_DIR: /Applications/Xcode_16.2.0.app/Contents/Developer
@@ -210,14 +249,15 @@ jobs:
210249
fetch-depth: 0
211250

212251
- name: Update submodule to match main
213-
env:
214-
OLD_DOT_COMMIT: ${{ env.OLD_DOT_COMMIT }}
215252
run: |
216253
git submodule update --init --remote
217-
if [[ -z "$OLD_DOT_COMMIT" ]]; then
218-
git fetch
219-
git checkout ${{ env.OLD_DOT_COMMIT }}
220-
fi
254+
255+
- name: Checkout Old Dot to author specified branch or commit
256+
if: ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF != '' }}
257+
run: |
258+
cd Mobile-Expensify
259+
git fetch
260+
git checkout ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF }}
221261
222262
- name: Configure MapBox SDK
223263
run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}

‎Mobile-Expensify

‎android/app/build.gradle

Lines changed: 2 additions & 2 deletions
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 1009008803
114-
versionName "9.0.88-3"
113+
versionCode 1009008805
114+
versionName "9.0.88-5"
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"

‎config/webpack/webpack.common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
179179
// We are importing this worker as a string by using asset/source otherwise it will default to loading via an HTTPS request later.
180180
// This causes issues if we have gone offline before the pdfjs web worker is set up as we won't be able to load it from the server.
181181
{
182-
test: new RegExp('node_modules/pdfjs-dist/build/pdf.worker.min.mjs'),
182+
test: new RegExp('node_modules/pdfjs-dist/legacy/build/pdf.worker.mjs'),
183183
type: 'asset/source',
184184
},
185185

‎docs/assets/images/commfeed-03.png

139 KB
Loading

0 commit comments

Comments
 (0)