Skip to content

Commit 0dfbe02

Browse files
committed
Merge branch 'main' into fix/83395-fullscreen-loading-indicator-reason-attributes
2 parents 58db378 + e806938 commit 0dfbe02

743 files changed

Lines changed: 46272 additions & 8137 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.

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 1009033400
115-
versionName "9.3.34-0"
114+
versionCode 1009033500
115+
versionName "9.3.35-0"
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"

babel.config.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const webpack = {
6363
};
6464

6565
const metro = {
66-
presets: [require('@react-native/babel-preset')],
66+
presets: [[require('@react-native/babel-preset'), {disableImportExportTransform: true}]],
6767
plugins: [
6868
['babel-plugin-react-compiler', ReactCompilerConfig], // must run first!
6969

@@ -174,5 +174,14 @@ module.exports = (api) => {
174174
const runningIn = api.caller((args = {}) => args.name);
175175
console.debug(' - running in: ', runningIn);
176176

177-
return ['metro', 'babel-jest'].includes(runningIn) ? metro : webpack;
177+
// Jest runs in Node.js without Metro's experimentalImportSupport transform,
178+
// so Babel must handle import/export transforms for tests.
179+
if (runningIn === 'babel-jest') {
180+
return {
181+
...metro,
182+
presets: [[require('@react-native/babel-preset'), {disableImportExportTransform: false}]],
183+
};
184+
}
185+
186+
return runningIn === 'metro' ? metro : webpack;
178187
};

contributingGuides/PAYMENT_VIA_EXPENSIFY.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,29 @@ Contributors are eligible to be paid via Expensify 18 months after they were ass
99
- View [Receive Payments](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Receive-Payments) for details on receiving payments in the US and internationally, including via Wise (formerly TransferWise), Paypal, Venmo and more.
1010

1111
After approval it can take between 1 business day and a week, depending on the country and service you use.
12+
13+
## For issues with deposits
14+
If you're having an issue with the deposit, ie. a report gets _stuck_ in a state like Approved, start a chat with Concierge. Ask them to create a Github issue using [this template](https://github.com/Expensify/Expensify/issues/new?template=MISSING_REIMBURSEMENT_TEMPLATE.md). Provide as many details below as possible
15+
16+
### Please provide the following details:
17+
> - Report ID:
18+
> - Reimbursement ID:
19+
> - Amount of reimbursement:
20+
> - Date reimbursement was initiated:
21+
> - Date reimbursement was expected:
22+
> - Last 4-digits of the deposit account:
23+
>
24+
> ### Is the missing reimbursement international (CAD > CAD, USD > GBP, etc.) or domestic?
25+
>
26+
> ### If this is an international reimbursement, please provide the following details
27+
> - Location of reimbursement account (AUD, CAD, GBP, EUR, USD)
28+
> - Location/currency of deposit account
29+
>
30+
> ### Have you received reimbursements to the connected deposit account successfully in the past?
31+
> - Yes or No
32+
>
33+
> ### Please select which option best describes the scenario:
34+
> - The recipient connected a deposit account that was closed
35+
> - The recipient entered the bank details incorrectly when connecting their deposit account
36+
> - The recipient entered the correct bank details, but the reimbursement is still missing
37+
> - Something else (please describe below)

0 commit comments

Comments
 (0)