Skip to content

Commit 7c38385

Browse files
JakubKorytkoJakubKorytko
committed
Merge branch 'main' into korytko/migrate-attachment-carousel-pager-RNGH
2 parents 03b908e + 12ab304 commit 7c38385

File tree

108 files changed

+1763
-1477
lines changed

Some content is hidden

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

108 files changed

+1763
-1477
lines changed

‎Mobile-Expensify

‎android/app/build.gradle

+2-2
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 1009014506
118-
versionName "9.1.45-6"
117+
versionCode 1009014516
118+
versionName "9.1.45-16"
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/integrationicons/circle-slash.svg

-12
This file was deleted.

‎assets/images/integrationicons/microsoft-dynamics-icon-square.svg

-30
This file was deleted.

‎assets/images/integrationicons/oracle-icon-square.svg

-17
This file was deleted.

‎assets/images/integrationicons/sap-icon-square.svg

-22
This file was deleted.

‎ios/NewExpensify/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.1.45.6</string>
47+
<string>9.1.45.16</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

‎ios/NotificationServiceExtension/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.1.45</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.45.6</string>
16+
<string>9.1.45.16</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

‎ios/ShareViewController/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.1.45</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.45.6</string>
16+
<string>9.1.45.16</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

‎modules/expensify-react-native-wallet.tgz

550 Bytes
Binary file not shown.

‎package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.1.45-6",
3+
"version": "9.1.45-16",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

‎react-native.config.js

+16-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
module.exports = {
1+
const isHybrid = process.env.IS_HYBRID_APP === 'true' ? true : false;
2+
3+
const config = {
24
assets: ['./assets/fonts/native'],
3-
dependencies: {
4-
// We need to unlink the react-native-wallet package from the android build
5-
// because it's not supported yet and we want to prevent the build from failing
6-
// due to missing Google TapAndPay SDK
7-
'@expensify/react-native-wallet': {
8-
platforms: {
9-
android: null,
10-
},
11-
},
12-
},
5+
dependencies: {},
136
};
7+
8+
// We need to unlink the react-native-wallet package from the android standalone build
9+
// to prevent the build from failing due to missing Google TapAndPay SDK
10+
if (!isHybrid) {
11+
config.dependencies['@expensify/react-native-wallet'] = {
12+
platforms: {
13+
android: null,
14+
},
15+
};
16+
}
17+
18+
module.exports = config;

‎src/CONST.ts

+7-10
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ const ONBOARDING_ACCOUNTING_MAPPING = {
6969
netsuite: 'NetSuite',
7070
intacct: 'Sage Intacct',
7171
quickbooksDesktop: 'QuickBooks Desktop',
72-
sap: 'SAP',
73-
oracle: 'Oracle',
74-
microsoftDynamics: 'Microsoft Dynamics',
75-
other: 'Other',
7672
};
7773

7874
const connectionsVideoPaths = {
@@ -277,7 +273,7 @@ type OnboardingPurpose = ValueOf<typeof onboardingChoices>;
277273

278274
type OnboardingCompanySize = ValueOf<typeof onboardingCompanySize>;
279275

280-
type OnboardingAccounting = keyof typeof CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY | null;
276+
type OnboardingAccounting = ValueOf<typeof CONST.POLICY.CONNECTIONS.NAME> | null;
281277

282278
const onboardingInviteTypes = {
283279
IOU: 'iou',
@@ -821,6 +817,7 @@ const CONST = {
821817
PRIVATE_DOMAIN_ONBOARDING: 'privateDomainOnboarding',
822818
IS_TRAVEL_VERIFIED: 'isTravelVerified',
823819
NEWDOT_MULTI_FILES_DRAG_AND_DROP: 'newDotMultiFilesDragAndDrop',
820+
PLAID_COMPANY_CARDS: 'plaidCompanyCards',
824821
},
825822
BUTTON_STATES: {
826823
DEFAULT: 'default',
@@ -1044,7 +1041,6 @@ const CONST = {
10441041
EMPTY_ARRAY,
10451042
EMPTY_OBJECT,
10461043
DEFAULT_NUMBER_ID,
1047-
FAKE_REPORT_ID: 'FAKE_REPORT_ID',
10481044
USE_EXPENSIFY_URL,
10491045
EXPENSIFY_URL,
10501046
GOOGLE_MEET_URL_ANDROID: 'https://meet.google.com',
@@ -1504,6 +1500,7 @@ const CONST = {
15041500
},
15051501
RESERVED_ROOM_NAMES: ['#admins', '#announce'],
15061502
MAX_PREVIEW_AVATARS: 4,
1503+
TRANSACTION_PREVIEW_WIDTH_WIDE: 303,
15071504
MAX_ROOM_NAME_LENGTH: 99,
15081505
LAST_MESSAGE_TEXT_MAX_LENGTH: 200,
15091506
MIN_LENGTH_LAST_MESSAGE_WITH_ELLIPSIS: 20,
@@ -3019,10 +3016,6 @@ const CONST = {
30193016
financialForce: 'FinancialForce',
30203017
billCom: 'Bill.com',
30213018
zenefits: 'Zenefits',
3022-
sap: 'SAP',
3023-
oracle: 'Oracle',
3024-
microsoftDynamics: 'Microsoft Dynamics',
3025-
other: 'Other',
30263019
},
30273020
AUTH_HELP_LINKS: {
30283021
intacct:
@@ -3270,6 +3263,7 @@ const CONST = {
32703263
CARD_DETAILS: 'CardDetails',
32713264
BANK_CONNECTION: 'BankConnection',
32723265
AMEX_CUSTOM_FEED: 'AmexCustomFeed',
3266+
SELECT_COUNTRY: 'SelectCountry',
32733267
},
32743268
CARD_TYPE: {
32753269
AMEX: 'amex',
@@ -4087,6 +4081,9 @@ const CONST = {
40874081
SE: 'Sweden',
40884082
},
40894083

4084+
PLAID_EXCLUDED_COUNTRIES: ['IR', 'CU', 'SY', 'UA', 'KP'] as string[],
4085+
PLAID_SUPPORT_COUNTRIES: ['US', 'CA', 'GB', 'AT', 'BE', 'DK', 'EE', 'FI', 'FR', 'DE', 'IE', 'IT', 'LV', 'LT', 'NL', 'NO', 'PL', 'PT', 'ES', 'SE'] as string[],
4086+
40904087
// Sources: https://github.com/Expensify/App/issues/14958#issuecomment-1442138427
40914088
// https://github.com/Expensify/App/issues/14958#issuecomment-1456026810
40924089
COUNTRY_ZIP_REGEX_DATA: {

‎src/ROUTES.ts

+5-29
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,12 @@ const ROUTES = {
8383
backTo,
8484
moneyRequestReportActionID,
8585
transactionID,
86-
iouReportID,
8786
}: {
8887
reportID: string | undefined;
8988
reportActionID?: string;
9089
backTo?: string;
9190
moneyRequestReportActionID?: string;
9291
transactionID?: string;
93-
iouReportID?: string;
9492
}) => {
9593
if (!reportID) {
9694
Log.warn('Invalid reportID is used to build the SEARCH_REPORT route');
@@ -107,10 +105,6 @@ const ROUTES = {
107105
queryParams.push(`moneyRequestReportActionID=${moneyRequestReportActionID}`);
108106
}
109107

110-
if (iouReportID) {
111-
queryParams.push(`iouReportID=${iouReportID}`);
112-
}
113-
114108
const queryString = queryParams.length > 0 ? (`${baseRoute}?${queryParams.join('&')}` as const) : baseRoute;
115109
return getUrlWithBackToParam(queryString, backTo);
116110
},
@@ -382,19 +376,10 @@ const ROUTES = {
382376
REPORT: 'r',
383377
REPORT_WITH_ID: {
384378
route: 'r/:reportID?/:reportActionID?',
385-
getRoute: (
386-
reportID: string | undefined,
387-
reportActionID?: string,
388-
referrer?: string,
389-
moneyRequestReportActionID?: string,
390-
transactionID?: string,
391-
backTo?: string,
392-
iouReportID?: string,
393-
) => {
379+
getRoute: (reportID: string | undefined, reportActionID?: string, referrer?: string, moneyRequestReportActionID?: string, transactionID?: string, backTo?: string) => {
394380
if (!reportID) {
395381
Log.warn('Invalid reportID is used to build the REPORT_WITH_ID route');
396382
}
397-
398383
const baseRoute = reportActionID ? (`r/${reportID}/${reportActionID}` as const) : (`r/${reportID}` as const);
399384

400385
const queryParams: string[] = [];
@@ -408,10 +393,6 @@ const ROUTES = {
408393
queryParams.push(`transactionID=${transactionID}`);
409394
}
410395

411-
if (iouReportID) {
412-
queryParams.push(`iouReportID=${iouReportID}`);
413-
}
414-
415396
const queryString = queryParams.length > 0 ? `?${queryParams.join('&')}` : '';
416397

417398
return getUrlWithBackToParam(`${baseRoute}${queryString}` as const, backTo);
@@ -593,15 +574,10 @@ const ROUTES = {
593574
},
594575
MONEY_REQUEST_HOLD_REASON: {
595576
route: ':type/edit/reason/:transactionID?/:searchHash?',
596-
getRoute: (type: ValueOf<typeof CONST.POLICY.TYPE>, transactionID: string, reportID: string | undefined, backTo: string, searchHash?: number) => {
597-
let route = searchHash
598-
? (`${type as string}/edit/reason/${transactionID}/${searchHash}/?backTo=${backTo}` as const)
599-
: (`${type as string}/edit/reason/${transactionID}/?backTo=${backTo}` as const);
600-
601-
if (reportID) {
602-
route = `${route}&reportID=${reportID}` as const;
603-
}
604-
577+
getRoute: (type: ValueOf<typeof CONST.POLICY.TYPE>, transactionID: string, reportID: string, backTo: string, searchHash?: number) => {
578+
const route = searchHash
579+
? (`${type as string}/edit/reason/${transactionID}/${searchHash}/?backTo=${backTo}&reportID=${reportID}` as const)
580+
: (`${type as string}/edit/reason/${transactionID}/?backTo=${backTo}&reportID=${reportID}` as const);
605581
return route;
606582
},
607583
},

0 commit comments

Comments
 (0)