Skip to content

Commit 2f18c04

Browse files
Merge branch 'main' into jakubkalinski0/Fix-console-errors-related-to-forwardRef-batch1
2 parents 88ee63d + 20db842 commit 2f18c04

52 files changed

Lines changed: 749 additions & 175 deletions

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
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009019300
118-
versionName "9.1.93-0"
117+
versionCode 1009019301
118+
versionName "9.1.93-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"
Lines changed: 105 additions & 0 deletions
Loading

docs/redirects.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -885,3 +885,4 @@ https://help.expensify.com/articles/travel/travel-analytics/Overview-Of-Analytic
885885
https://help.expensify.com/articles/travel/getting-started/How-Expensify-And-Expensify-Travel-Connect,https://help.expensify.com/articles/travel/getting-started/How-Expensify-and-Expensify-Travel-Connect
886886
https://help.expensify.com/articles/travel/travel-policy/Setting-Approval-Types-And-Adding-Members,https://help.expensify.com/articles/travel/travel-policy/Setting-Approval-Types-and-Adding-Members
887887
https://community.expensify.com/discussion/4825/how-to-create-and-send-invoices,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Send-and-Pay-Invoices
888+
https://help.expensify.com/new-expensify/hubs/getting-started/Free-Features-in-Expensify,https://help.expensify.com/articles/new-expensify/getting-started/Free-Features-in-Expensify

ios/NewExpensify/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.1.93.0</string>
47+
<string>9.1.93.1</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.1.93</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.93.0</string>
16+
<string>9.1.93.1</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.1.93</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.93.0</string>
16+
<string>9.1.93.1</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.1.93-0",
3+
"version": "9.1.93-1",
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.",

src/CONST/index.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const ACTIVE_EXPENSIFY_URL = addTrailingForwardSlash(Config?.NEW_EXPENSIFY_URL ?
3030
const USE_EXPENSIFY_URL = 'https://use.expensify.com';
3131
const EXPENSIFY_MOBILE_URL = 'https://expensify.com/mobile';
3232
const EXPENSIFY_URL = 'https://www.expensify.com';
33+
const UBER_CONNECT_URL = 'https://business-integrations.uber.com/connect';
3334
const PLATFORM_OS_MACOS = 'Mac OS';
3435
const PLATFORM_IOS = 'iOS';
3536
const ANDROID_PACKAGE_NAME = 'org.me.mobiexpensifyg';
@@ -417,6 +418,7 @@ const CONST = {
417418
},
418419

419420
NEW_EXPENSIFY_URL: ACTIVE_EXPENSIFY_URL,
421+
UBER_CONNECT_URL,
420422
APP_DOWNLOAD_LINKS: {
421423
ANDROID: `https://play.google.com/store/apps/details?id=${ANDROID_PACKAGE_NAME}`,
422424
IOS: 'https://apps.apple.com/us/app/expensify-travel-expense/id471713959',
@@ -2956,6 +2958,12 @@ const CONST = {
29562958
TOBACCO: 'tobacco',
29572959
ADULT_ENTERTAINMENT: 'adultEntertainment',
29582960
},
2961+
RECEIPT_PARTNERS: {
2962+
NAME: {UBER: 'uber'},
2963+
NAME_USER_FRIENDLY: {
2964+
uber: 'Uber for Business',
2965+
},
2966+
},
29592967
CONNECTIONS: {
29602968
NAME: {
29612969
// Here we will add other connections names when we add support for them

0 commit comments

Comments
 (0)