Skip to content

Commit 133bfab

Browse files
committed
Merge branch 'main' into pac-guerreiro/fix/unexpected-error-submitting-this-expense
2 parents ad00742 + 4b68aa8 commit 133bfab

133 files changed

Lines changed: 4570 additions & 2624 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.

.well-known/apple-app-site-association

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
"/": "/a/*",
1313
"comment": "Profile Page"
1414
},
15+
{
16+
"/": "/home/*",
17+
"comment": "Home Page"
18+
},
19+
{
20+
"/": "/workspaces/*",
21+
"comment": "Workspaces List Page"
22+
},
1523
{
1624
"/": "/settings/*",
1725
"comment": "Profile and app settings"

Mobile-Expensify

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
export default function analytics() {
2-
return {
3-
logEvent: jest.fn(),
4-
};
5-
}
1+
const logEvent = jest.fn();
2+
const getAnalytics = jest.fn();
3+
4+
export {logEvent, getAnalytics};
Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
import type {FirebaseCrashlyticsTypes} from '@react-native-firebase/crashlytics';
2-
3-
type CrashlyticsModule = Pick<FirebaseCrashlyticsTypes.Module, 'log' | 'recordError' | 'setCrashlyticsCollectionEnabled' | 'setUserId'>;
4-
5-
type CrashlyticsMock = () => CrashlyticsModule;
6-
71
// <App> uses <ErrorBoundary> and we need to mock the imported crashlytics module
82
// due to an error that happens otherwise https://github.com/invertase/react-native-firebase/issues/2475
9-
const crashlyticsMock: CrashlyticsMock = () => ({
10-
log: jest.fn(),
11-
recordError: jest.fn(),
12-
setCrashlyticsCollectionEnabled: jest.fn(),
13-
setUserId: jest.fn(),
14-
});
3+
const getCrashlytics = jest.fn();
4+
const log = jest.fn();
5+
const recordError = jest.fn();
6+
const setCrashlyticsCollectionEnabled = jest.fn();
7+
const setUserId = jest.fn();
158

16-
export default crashlyticsMock;
9+
export {getCrashlytics, log, recordError, setCrashlyticsCollectionEnabled, setUserId};
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
type PerfMock = () => void;
1+
/* eslint-disable import/prefer-default-export */
2+
const getPerformance = jest.fn();
23

3-
const perfMock: PerfMock = () => {};
4-
5-
export default perfMock;
4+
export {getPerformance};

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 1009018503
118-
versionName "9.1.85-3"
117+
versionCode 1009018603
118+
versionName "9.1.86-3"
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"

cspell.json

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
"águero",
1313
"Aircall",
1414
"airshipconfig",
15+
"airside",
1516
"Amal",
16-
"Amals",
17+
"Amal's",
1718
"americanexpressfdx",
1819
"Amina",
1920
"androiddebugkey",
@@ -44,6 +45,7 @@
4445
"as_siteseach",
4546
"asar",
4647
"assetlinks",
48+
"ASPAC",
4749
"attributes.accountid",
4850
"attributes.reportid",
4951
"authorised",
@@ -54,6 +56,7 @@
5456
"autofilled",
5557
"automations",
5658
"autoplay",
59+
"AUTOREIMBURSED",
5760
"autoreleasepool",
5861
"AUTOREPORTING",
5962
"autoresizesSubviews",
@@ -106,7 +109,9 @@
106109
"clawback",
107110
"cleartext",
108111
"CLIENTID",
112+
"CLIA",
109113
"clippath",
114+
"Cliqbook",
110115
"cloudflarestream",
111116
"cmaps",
112117
"cmjs",
@@ -163,11 +168,13 @@
163168
"ecash",
164169
"econn",
165170
"ecconnrefused",
171+
"EDIFACT",
166172
"Egencia",
167173
"Electromedical",
168174
"electronmon",
169175
"Electrotherapeutic",
170176
"ellipsize",
177+
"EMEA",
171178
"Emphemeral",
172179
"endcapture",
173180
"enddate",
@@ -177,10 +184,13 @@
177184
"enroute",
178185
"ENVFILE",
179186
"Ephermeral",
187+
"eraa",
180188
"ERECEIPT",
181189
"ERECEIPTS",
182190
"Español",
191+
"ESTA",
183192
"ethnicities",
193+
"eticket",
184194
"EUVAT",
185195
"evenodd",
186196
"eventmachine",
@@ -189,6 +199,7 @@
189199
"exchrate",
190200
"exfy",
191201
"exitstatus",
202+
"Expatriot",
192203
"Expensable",
193204
"expensescount",
194205
"Expensi",
@@ -228,12 +239,14 @@
228239
"Frederico",
229240
"frontpart",
230241
"fullstory",
242+
"FWTV",
231243
"FXHF",
232244
"Gaber",
233245
"gastos",
234246
"GBRRBR",
235247
"gcsc",
236248
"gcse",
249+
"GDSO",
237250
"genkey",
238251
"GEOLOCATION",
239252
"getprop",
@@ -253,13 +266,16 @@
253266
"hanno_gödecke",
254267
"headshot",
255268
"healthcheck",
269+
"Heathrow",
256270
"helpsite",
257271
"Highfive",
258272
"Highlightable",
259273
"Hoverable",
260274
"HRMS",
261275
"hybridapp",
262276
"Hydronics",
277+
"iaco",
278+
"IBTA",
263279
"IDEIN",
264280
"idfa",
265281
"Idology",
@@ -346,6 +362,7 @@
346362
"microtime",
347363
"Microtransaction",
348364
"microtransactions",
365+
"midoffice",
349366
"mimecast",
350367
"Miniwarehouses",
351368
"miterlimit",
@@ -368,6 +385,7 @@
368385
"Navan",
369386
"navattic",
370387
"navigations",
388+
"nbta",
371389
"ndkversion",
372390
"Nederlands",
373391
"negsign",
@@ -382,6 +400,7 @@
382400
"newhelp",
383401
"ngneat",
384402
"NGROK",
403+
"NLRA",
385404
"nmanager",
386405
"NMLS",
387406
"nocreeps",
@@ -406,6 +425,7 @@
406425
"NSUTF8",
407426
"ntag",
408427
"ntdiary",
428+
"NTSB",
409429
"Nuevo",
410430
"nullptr",
411431
"numberformat",
@@ -433,6 +453,7 @@
433453
"originalcurrency",
434454
"osdk",
435455
"otpauth",
456+
"outplant",
436457
"parasharrajat",
437458
"Parcelable",
438459
"passplus",
@@ -493,6 +514,7 @@
493514
"Reauthenticator",
494515
"Rebooked",
495516
"REBOOKED",
517+
"rebooking",
496518
"recategorize",
497519
"recents",
498520
"REDIRECTURI",
@@ -595,10 +617,12 @@
595617
"systempreferences",
596618
"tabindex",
597619
"Talkspace",
620+
"TBUM",
598621
"teachersunite",
599622
"Tele",
600623
"Teleproduction",
601624
"testflight",
625+
"TIMATIC",
602626
"tnode",
603627
"tobe",
604628
"togglefullscreen",
@@ -616,6 +640,7 @@
616640
"UBOI",
617641
"UBOS",
618642
"UDID",
643+
"UDIDS",
619644
"UIBG",
620645
"uimanager",
621646
"ukkonen",
@@ -649,6 +674,7 @@
649674
"viewability",
650675
"viewport",
651676
"viewports",
677+
"VMPD",
652678
"voidings",
653679
"vorbis",
654680
"vvcf",

docs/articles/travel/getting-started/Common-Travel-Terms-and-Abbreviations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ Understanding the common terminology and abbreviations used in the travel indust
313313
| minimum stay | The minimum time a travel traveler must stay at a destination (or be gone ‘away from home’ internationally) before return travel can commence. |
314314
| miscellaneous charge order (MCO) | An accountable document issued by a travel agency or airline as proof of payment for a specific fee (such as pet service fee) or as residual amount of an exchange (higher priced ticket exchanged for a lower priced ticket) to be used on a future purchase. |
315315
| National Business Travel Association | U.S. business travel association which is a member of IBTA. www.nbta.org |
316-
| New Districtubtion Capability (NDC) | New distribution capability. This is a modern standard developed by the airline industry to improve how travel information is shared. It allows airlines to provide more detailed and customized travel options directly to travelers and travel agencies. |
316+
| New Distribution Capability (NDC) | New distribution capability. This is a modern standard developed by the airline industry to improve how travel information is shared. It allows airlines to provide more detailed and customized travel options directly to travelers and travel agencies. |
317317
| negotiated fare/rate | This is a term used by travel agents to describe reduced airfares that have been negotiated by their airfare specialists on behalf of clients. |
318318
| neutral units of construction (NUC) | An imaginary currency established by IATA that allows fares of different currencies to be added together; this fare construction principle is only used internationally. |
319319
| non-endorsable | This expression often appears in the endorsements box of an airline ticket and it means that the flight coupon on which the words appear may be used only on the services of the airline indicated. |

ios/NewExpensify-Bridging-Header.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
#import "RCTStartupTimer.h"
1010
#import <HardwareShortcuts.h>
1111
#import <BackgroundTasks/BackgroundTasks.h>
12-
#import <expensify-react-native-background-task/RNBackgroundTaskManager.h>
12+
#import <RNBackgroundTaskManager.h>

0 commit comments

Comments
 (0)