Skip to content

Commit c0ee5cf

Browse files
pac-guerreiropac-guerreiro
committed
Merge branch 'main' into pac-guerreiro/issue/62882-change-function-to-be-pure-where-taskReport-is-passed-as-a-parameter
2 parents e0e23fc + 7b61f68 commit c0ee5cf

62 files changed

Lines changed: 1146 additions & 567 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
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009015406
118-
versionName "9.1.54-6"
117+
versionCode 1009015407
118+
versionName "9.1.54-7"
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"

‎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.54.6</string>
47+
<string>9.1.54.7</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.54</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.54.6</string>
16+
<string>9.1.54.7</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.54</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.54.6</string>
16+
<string>9.1.54.7</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

‎package-lock.json‎

Lines changed: 9 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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.1.54-6",
3+
"version": "9.1.54-7",
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.",
@@ -135,6 +135,7 @@
135135
"expo-image-manipulator": "^13.0.6",
136136
"fast-equals": "^4.0.3",
137137
"focus-trap-react": "^11.0.3",
138+
"heic-to": "^1.1.13",
138139
"howler": "^2.2.4",
139140
"htmlparser2": "^7.2.0",
140141
"idb-keyval": "^6.2.1",

‎src/CONST.ts‎

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ const createWorkspaceTask: OnboardingTask = {
152152
description: ({workspaceSettingsLink}) =>
153153
'*Create a workspace* to track expenses, scan receipts, chat, and more.\n' +
154154
'\n' +
155-
'Here’s how to create a workspace:\n' +
156-
'\n' +
157155
'1. Click *Settings*.\n' +
158156
'2. Click *Workspaces* > *New workspace*.\n' +
159157
'\n' +
@@ -170,8 +168,6 @@ const setupCategoriesTask: OnboardingTask = {
170168
description: ({workspaceCategoriesLink}) =>
171169
'*Set up categories* so your team can code expenses for easy reporting.\n' +
172170
'\n' +
173-
'Here’s how to set up categories:\n' +
174-
'\n' +
175171
'1. Click *Settings*.\n' +
176172
'2. Go to *Workspaces*.\n' +
177173
'3. Select your workspace.\n' +
@@ -196,8 +192,6 @@ const onboardingEmployerOrSubmitMessage: OnboardingMessage = {
196192
description:
197193
'*Submit an expense* by entering an amount or scanning a receipt.\n' +
198194
'\n' +
199-
'Here’s how to submit an expense:\n' +
200-
'\n' +
201195
'1. Click the green *+* button.\n' +
202196
'2. Choose *Create expense*.\n' +
203197
'3. Enter an amount or scan a receipt.\n' +
@@ -220,8 +214,6 @@ const combinedTrackSubmitOnboardingEmployerOrSubmitMessage: OnboardingMessage =
220214
description:
221215
'*Submit an expense* by entering an amount or scanning a receipt.\n' +
222216
'\n' +
223-
'Here’s how to submit an expense:\n' +
224-
'\n' +
225217
'1. Click the green *+* button.\n' +
226218
'2. Choose *Create expense*.\n' +
227219
'3. Enter an amount or scan a receipt.\n' +
@@ -245,8 +237,6 @@ const onboardingPersonalSpendMessage: OnboardingMessage = {
245237
description:
246238
'*Track an expense* in any currency, whether you have a receipt or not.\n' +
247239
'\n' +
248-
'Here’s how to track an expense:\n' +
249-
'\n' +
250240
'1. Click the green *+* button.\n' +
251241
'2. Choose *Create expense*.\n' +
252242
'3. Enter an amount or scan a receipt.\n' +
@@ -269,8 +259,6 @@ const combinedTrackSubmitOnboardingPersonalSpendMessage: OnboardingMessage = {
269259
description:
270260
'*Track an expense* in any currency, whether you have a receipt or not.\n' +
271261
'\n' +
272-
'Here’s how to track an expense:\n' +
273-
'\n' +
274262
'1. Click the green *+* button.\n' +
275263
'2. Choose *Create expense*.\n' +
276264
'3. Enter an amount or scan a receipt.\n' +
@@ -450,7 +438,7 @@ const CONST = {
450438
MIN_SIZE: 240,
451439

452440
// Allowed extensions for receipts
453-
ALLOWED_RECEIPT_EXTENSIONS: ['jpg', 'jpeg', 'gif', 'png', 'pdf', 'htm', 'html', 'text', 'rtf', 'doc', 'tif', 'tiff', 'msword', 'zip', 'xml', 'message'],
441+
ALLOWED_RECEIPT_EXTENSIONS: ['heif', 'heic', 'jpg', 'jpeg', 'gif', 'png', 'pdf', 'htm', 'html', 'text', 'rtf', 'doc', 'tif', 'tiff', 'msword', 'zip', 'xml', 'message'],
454442
},
455443

456444
// Allowed extensions for spreadsheets import
@@ -2696,6 +2684,11 @@ const CONST = {
26962684
EXPENSIFY_PAYMENTS: 'Expensify Payments LLC',
26972685
BANCORP_BANK: 'The Bancorp Bank, N.A.',
26982686
},
2687+
STATEMENT_ACTIONS: {
2688+
SUBMIT_EXPENSE: 'start/submit/manual',
2689+
PAY_SOMEONE: 'start/pay/manual',
2690+
SPLIT_EXPENSE: 'start/split/manual',
2691+
},
26992692
},
27002693

27012694
PLAID: {
@@ -2991,6 +2984,11 @@ const CONST = {
29912984
},
29922985
ID_FAKE: '_FAKE_',
29932986
EMPTY: 'EMPTY',
2987+
SECONDARY_ACTIONS: {
2988+
IMPORT_SPREADSHEET: 'importSpreadsheet',
2989+
DOWNLOAD_CSV: 'downloadCSV',
2990+
SETTINGS: 'settings',
2991+
},
29942992
MEMBERS_BULK_ACTION_TYPES: {
29952993
REMOVE: 'remove',
29962994
MAKE_MEMBER: 'makeMember',
@@ -5518,8 +5516,6 @@ const CONST = {
55185516
description: ({integrationName, workspaceAccountingLink}) =>
55195517
`Connect to ${integrationName} for automatic expense coding and syncing that makes month-end close a breeze.\n` +
55205518
'\n' +
5521-
`Here’s how to connect to ${integrationName}:\n` +
5522-
'\n' +
55235519
'1. Click *Settings*.\n' +
55245520
'2. Go to *Workspaces*.\n' +
55255521
'3. Select your workspace.\n' +
@@ -5539,8 +5535,6 @@ const CONST = {
55395535
description: ({corporateCardLink}) =>
55405536
`Connect your corporate card to automatically import and code expenses.\n` +
55415537
'\n' +
5542-
'Here’s how to invite your team:\n' +
5543-
'\n' +
55445538
'1. Click *Workspaces*.\n' +
55455539
'2. Select your workspace.\n' +
55465540
'3. Click *Corporate cards*.\n' +
@@ -5560,8 +5554,6 @@ const CONST = {
55605554
description: ({workspaceMembersLink}) =>
55615555
'*Invite your team* to Expensify so they can start tracking expenses today.\n' +
55625556
'\n' +
5563-
'Here’s how to invite your team:\n' +
5564-
'\n' +
55655557
'1. Click *Settings*.\n' +
55665558
'2. Go to *Workspaces*.\n' +
55675559
'3. Select your workspace.\n' +
@@ -5594,8 +5586,6 @@ const CONST = {
55945586
description: ({workspaceMoreFeaturesLink}) =>
55955587
'Tags can be used if you want more details with every expense. Use tags for projects, clients, locations, departments, and more. If you need multiple levels of tags, you can upgrade to the Control plan.\n' +
55965588
'\n' +
5597-
'*Here’s how to set up tags:*\n' +
5598-
'\n' +
55995589
'1. Click *Settings*.\n' +
56005590
'2. Go to *Workspaces*.\n' +
56015591
'3. Select your workspace.\n' +
@@ -5630,8 +5620,6 @@ const CONST = {
56305620
description: ({workspaceMembersLink}) =>
56315621
'*Invite your accountant* to Expensify and share your expenses with them to make tax time easier.\n' +
56325622
'\n' +
5633-
'Here’s how to invite your accountant:\n' +
5634-
'\n' +
56355623
'1. Click your profile picture.\n' +
56365624
'2. Go to *Workspaces*.\n' +
56375625
'3. Select your workspace.\n' +
@@ -5659,8 +5647,6 @@ const CONST = {
56595647
description:
56605648
'*Start a chat* with a friend or group using their email or phone number.\n' +
56615649
'\n' +
5662-
'Here’s how to start a chat:\n' +
5663-
'\n' +
56645650
'1. Click the green *+* button.\n' +
56655651
'2. Choose *Start chat*.\n' +
56665652
'3. Enter emails or phone numbers.\n' +
@@ -5677,8 +5663,6 @@ const CONST = {
56775663
description:
56785664
'*Split an expense* right in your chat with one or more friends.\n' +
56795665
'\n' +
5680-
'Here’s how to request money:\n' +
5681-
'\n' +
56825666
'1. Click the green *+* button.\n' +
56835667
'2. Choose *Start chat*.\n' +
56845668
'3. Enter any email, SMS, or name of who you want to split with.\n' +
@@ -5711,8 +5695,6 @@ const CONST = {
57115695
description:
57125696
'*Submit an expense* by entering an amount or scanning a receipt.\n' +
57135697
'\n' +
5714-
'Here’s how to submit an expense:\n' +
5715-
'\n' +
57165698
'1. Click the green *+* button.\n' +
57175699
'2. Choose *Create expense*.\n' +
57185700
'3. Enter an amount or scan a receipt.\n' +
@@ -6483,9 +6465,9 @@ const CONST = {
64836465
ACTIVE_WORKSPACE_ID: 'ACTIVE_WORKSPACE_ID',
64846466
RETRY_LAZY_REFRESHED: 'RETRY_LAZY_REFRESHED',
64856467
LAST_REFRESH_TIMESTAMP: 'LAST_REFRESH_TIMESTAMP',
6486-
LAST_VISITED_TAB_PATH: {
6487-
WORKSPACES: 'LAST_VISITED_WORKSPACES_TAB_PATH',
6488-
SETTINGS: 'LAST_VISITED_SETTINGS_TAB_PATH',
6468+
LAST_VISITED_PATH: {
6469+
WORKSPACES_TAB: 'LAST_VISITED_PATH_WORKSPACES_TAB',
6470+
SETTINGS_TAB: 'LAST_VISITED_PATH_SETTINGS_TAB',
64896471
},
64906472
},
64916473

‎src/ROUTES.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -933,8 +933,6 @@ const ROUTES = {
933933
label ? `${backTo || state ? '&' : '?'}label=${encodeURIComponent(label)}` : ''
934934
}` as const,
935935
},
936-
IOU_REQUEST: 'submit/new',
937-
IOU_SEND: 'pay/new',
938936
IOU_SEND_ADD_BANK_ACCOUNT: 'pay/new/add-bank-account',
939937
IOU_SEND_ADD_DEBIT_CARD: 'pay/new/add-debit-card',
940938
IOU_SEND_ENABLE_PAYMENTS: 'pay/new/enable-payments',
@@ -1890,6 +1888,8 @@ const ROUTES = {
18901888
getRoute: (contentType: string, backTo?: string) => getUrlWithBackToParam(`referral/${contentType}`, backTo),
18911889
},
18921890
SHARE_ROOT: 'share/root',
1891+
SHARE_ROOT_SHARE: 'share/root/share',
1892+
SHARE_ROOT_SUBMIT: 'share/root/submit',
18931893
SHARE_DETAILS: {
18941894
route: 'share/share-details/:reportOrAccountID',
18951895
getRoute: (reportOrAccountID: string) => `share/share-details/${reportOrAccountID}` as const,

‎src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ function BaseEmojiPickerMenu(
126126
scrollPaddingTop: isFiltered ? 0 : CONST.EMOJI_PICKER_ITEM_HEIGHT,
127127
},
128128
}}
129+
scrollEnabled={data.length > 0}
129130
/>
130131
</View>
131132
<EmojiSkinToneList />

0 commit comments

Comments
 (0)