Skip to content

Commit 485ca04

Browse files
kacper-mikolajczakkacper-mikolajczak
committed
merge main
2 parents cd56779 + 539e269 commit 485ca04

File tree

272 files changed

+3936
-4071
lines changed

Some content is hidden

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

272 files changed

+3936
-4071
lines changed

‎.github/workflows/failureNotifier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
repo: context.repo.repo,
8989
title: issueTitle,
9090
body: issueBody,
91-
labels: [failureLabel, 'Daily'],
91+
labels: [failureLabel, 'Hourly'],
9292
assignees: [prMerger]
9393
});
9494
}

‎__mocks__/@react-native-community/netinfo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import {NetInfoCellularGeneration, NetInfoStateType} from '@react-native-communi
22
import type {addEventListener, configure, fetch, NetInfoState, refresh, useNetInfo} from '@react-native-community/netinfo';
33

44
const defaultState: NetInfoState = {
5-
type: NetInfoStateType.cellular,
5+
type: NetInfoStateType?.cellular,
66
isConnected: true,
77
isInternetReachable: true,
88
details: {
99
isConnectionExpensive: true,
10-
cellularGeneration: NetInfoCellularGeneration['3g'],
10+
cellularGeneration: NetInfoCellularGeneration?.['3g'],
1111
carrier: 'T-Mobile',
1212
},
1313
};

‎android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ android {
9898
minSdkVersion rootProject.ext.minSdkVersion
9999
targetSdkVersion rootProject.ext.targetSdkVersion
100100
multiDexEnabled rootProject.ext.multiDexEnabled
101-
versionCode 1001044305
102-
versionName "1.4.43-5"
101+
versionCode 1001044314
102+
versionName "1.4.43-14"
103103
}
104104

105105
flavorDimensions "default"

‎docs/articles/expensify-classic/getting-started/Invite-Members.md renamed to ‎docs/articles/expensify-classic/manage-employees-and-report-approvals/Invite-Members.md

File renamed without changes.

‎docs/articles/expensify-classic/settings/account-settings/Manage-devices.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
title: Manage devices
3+
description: Control which devices can access your Expensify account
4+
---
5+
<div id="expensify-classic" markdown="1">
6+
7+
You can see which devices have been used to access your Expensify account and even remove devices that you no longer want to have access to your account.
8+
9+
{% include info.html %}
10+
This process is currently not available from the mobile app and must be completed from the Expensify website.
11+
{% include end-info.html %}
12+
13+
1. Hover over Settings and click **Account**.
14+
2. Under Account Details, scroll down to the Device Management section.
15+
3. Click **Device Management** to expand the section.
16+
4. Review the devices that have access to your account. To remove access for a specific device, click **Revoke** next to it.
17+
18+
</div>

‎docs/articles/expensify-classic/settings/account-settings/Set-notifications.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
title: Set notifications
3+
description: Select your Expensify notification preferences
4+
---
5+
<div id="expensify-classic" markdown="1">
6+
7+
{% include info.html %}
8+
This process is currently not available from the mobile app and must be completed from the Expensify website.
9+
{% include end-info.html %}
10+
11+
1. Hover over Settings and click **Account**.
12+
2. Click the **Preferences** tab on the left.
13+
3. Scroll down to the Contact Preferences section.
14+
4. Select the checkbox for the types of notifications you wish to receive.
15+
</div>

‎docs/redirects.csv

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ https://community.expensify.com/discussion/5194/how-to-assign-a-vacation-delegat
2525
https://community.expensify.com/discussion/5190/how-to-individually-assign-a-vacation-delegate-from-account-settings,https://help.expensify.com/articles/expensify-classic/manage-employees-and-report-approvals/Vacation-Delegate
2626
https://community.expensify.com/discussion/5274/how-to-set-up-an-adp-indirect-integration-with-expensify,https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/ADP
2727
https://community.expensify.com/discussion/5776/how-to-create-mileage-expenses-in-expensify,https://help.expensify.com/articles/expensify-classic/get-paid-back/Distance-Tracking
28-
https://community.expensify.com/discussion/7385/how-to-enable-two-factor-authentication-in-your-account,https://help.expensify.com/articles/expensify-classic/account-settings/Account-Details
29-
https://community.expensify.com/discussion/5124/how-to-add-your-name-and-photo-to-your-account,https://help.expensify.com/articles/expensify-classic/account-settings/Account-Details
30-
https://community.expensify.com/discussion/5149/how-to-manage-your-devices-in-expensify,https://help.expensify.com/articles/expensify-classic/account-settings/Account-Details
31-
https://community.expensify.com/discussion/4432/how-to-add-a-secondary-login,https://help.expensify.com/articles/expensify-classic/account-settings/Account-Details
32-
https://community.expensify.com/discussion/6794/how-to-change-your-email-in-expensify,https://help.expensify.com/articles/expensify-classic/account-settings/Account-Details
28+
https://community.expensify.com/discussion/7385/how-to-enable-two-factor-authentication-in-your-account,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
29+
https://community.expensify.com/discussion/5124/how-to-add-your-name-and-photo-to-your-account,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
30+
https://community.expensify.com/discussion/5149/how-to-manage-your-devices-in-expensify,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
31+
https://community.expensify.com/discussion/4432/how-to-add-a-secondary-login,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
32+
https://community.expensify.com/discussion/6794/how-to-change-your-email-in-expensify,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
3333
https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks.html,https://use.expensify.com/company-credit-card
3434
https://help.expensify.com/articles/expensify-classic/expensify-partner-program/How-to-Join-the-ExpensifyApproved!-Partner-Program.html,https://use.expensify.com/accountants-program
3535
https://help.expensify.com/articles/expensify-classic/getting-started/approved-accountants/Card-Revenue-Share-For-Expensify-Approved-Partners, https://use.expensify.com/blog/maximizing-rewards-expensifyapproved-accounting-partners-now-earn-0-5-revenue-share
3636
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/International-Reimbursements,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/Global-Reimbursements
37-
https://community.expensify.com/discussion/4452/how-to-merge-accounts,https://help.expensify.com/articles/expensify-classic/account-settings/Merge-Accounts
37+
https://community.expensify.com/discussion/4452/how-to-merge-accounts,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Merge-accounts
3838
https://community.expensify.com/discussion/4783/how-to-add-or-remove-a-copilot,https://help.expensify.com/articles/expensify-classic/account-settings/Copilot
3939
https://community.expensify.com/discussion/4343/expensify-anz-partnership-announcement,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Connect-ANZ
4040
https://community.expensify.com/discussion/7318/deep-dive-company-credit-card-import-options,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards
@@ -54,3 +54,9 @@ https://help.expensify.com/articles/expensify-classic/getting-started/Employees,
5454
https://help.expensify.com/articles/expensify-classic/getting-started/Using-The-App,https://help.expensify.com/articles/expensify-classic/getting-started/Join-your-company's-workspace
5555
https://help.expensify.com/articles/expensify-classic/getting-started/support/Expensify-Support,https://use.expensify.com/support
5656
https://help.expensify.com/articles/expensify-classic/getting-started/Plan-Types,https://use.expensify.com/
57+
https://help.expensify.com/articles/new-expensify/payments/Referral-Program,https://help.expensify.com/articles/expensify-classic/get-paid-back/Referral-Program
58+
https://help.expensify.com/articles/expensify-classic/account-settings/Account-Details,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
59+
https://help.expensify.com/articles/expensify-classic/account-settings/Preferences,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
60+
https://help.expensify.com/articles/expensify-classic/account-settings/Merge-Accounts,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Merge-accounts
61+
https://help.expensify.com/articles/expensify-classic/getting-started/Individual-Users,https://help.expensify.com/articles/expensify-classic/getting-started/Create-a-workspace-for-yourself
62+
https://help.expensify.com/articles/expensify-classic/getting-started/Invite-Members,https://help.expensify.com/articles/expensify-classic/manage-employees-and-report-approvals/Invite-Members

‎ios/NewExpensify/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</dict>
4141
</array>
4242
<key>CFBundleVersion</key>
43-
<string>1.4.43.5</string>
43+
<string>1.4.43.14</string>
4444
<key>ITSAppUsesNonExemptEncryption</key>
4545
<false/>
4646
<key>LSApplicationQueriesSchemes</key>

‎ios/NewExpensifyTests/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1.4.43.5</string>
22+
<string>1.4.43.14</string>
2323
</dict>
2424
</plist>

‎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>1.4.43</string>
1515
<key>CFBundleVersion</key>
16-
<string>1.4.43.5</string>
16+
<string>1.4.43.14</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

‎jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
`<rootDir>/?(*.)+(spec|test).${testFileExtension}`,
99
],
1010
transform: {
11-
'^.+\\.jsx?$': 'babel-jest',
11+
'^.+\\.[jt]sx?$': 'babel-jest',
1212
'^.+\\.svg?$': 'jest-transformer-svg',
1313
},
1414
transformIgnorePatterns: ['<rootDir>/node_modules/(?!react-native)/'],

‎package-lock.json

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

‎package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "1.4.43-5",
3+
"version": "1.4.43-14",
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.",
@@ -50,8 +50,8 @@
5050
"analyze-packages": "ANALYZE_BUNDLE=true webpack --config config/webpack/webpack.common.js --env envFile=.env.production",
5151
"symbolicate:android": "npx metro-symbolicate android/app/build/generated/sourcemaps/react/release/index.android.bundle.map",
5252
"symbolicate:ios": "npx metro-symbolicate main.jsbundle.map",
53-
"test:e2e": "ts-node tests/e2e/testRunner.js --development --skipCheckout --skipInstallDeps --buildMode none",
54-
"test:e2e:dev": "ts-node tests/e2e/testRunner.js --development --skipCheckout --config ./config.dev.js --buildMode skip --skipInstallDeps",
53+
"test:e2e": "ts-node tests/e2e/testRunner.js --config ./config.local.ts",
54+
"test:e2e:dev": "ts-node tests/e2e/testRunner.js --config ./config.dev.js",
5555
"gh-actions-unused-styles": "./.github/scripts/findUnusedKeys.sh",
5656
"workflow-test": "./workflow_tests/scripts/runWorkflowTests.sh",
5757
"workflow-test:generate": "ts-node workflow_tests/utils/preGenerateTest.js",
@@ -86,6 +86,7 @@
8686
"@react-native-picker/picker": "2.5.1",
8787
"@react-navigation/material-top-tabs": "^6.6.3",
8888
"@react-navigation/native": "6.1.8",
89+
"@react-navigation/native-stack": "^6.9.17",
8990
"@react-navigation/stack": "6.3.16",
9091
"@react-ng/bounds-observer": "^0.2.1",
9192
"@rnmapbox/maps": "^10.1.11",
@@ -145,7 +146,7 @@
145146
"react-native-linear-gradient": "^2.8.1",
146147
"react-native-localize": "^2.2.6",
147148
"react-native-modal": "^13.0.0",
148-
"react-native-onyx": "2.0.2",
149+
"react-native-onyx": "2.0.6",
149150
"react-native-pager-view": "6.2.2",
150151
"react-native-pdf": "6.7.3",
151152
"react-native-performance": "^5.1.0",

‎patches/@react-navigation+native-stack+6.9.17.patch

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
diff --git a/node_modules/@react-navigation/native-stack/src/types.tsx b/node_modules/@react-navigation/native-stack/src/types.tsx
2+
index 206fb0b..7a34a8e 100644
3+
--- a/node_modules/@react-navigation/native-stack/src/types.tsx
4+
+++ b/node_modules/@react-navigation/native-stack/src/types.tsx
5+
@@ -490,6 +490,14 @@ export type NativeStackNavigationOptions = {
6+
* Only supported on iOS and Android.
7+
*/
8+
freezeOnBlur?: boolean;
9+
+ // partial changes from https://github.com/react-navigation/react-navigation/commit/90cfbf23bcc5259f3262691a9eec6c5b906e5262
10+
+ // patch can be removed when new version of `native-stack` will be released
11+
+ /**
12+
+ * Whether the keyboard should hide when swiping to the previous screen. Defaults to `false`.
13+
+ *
14+
+ * Only supported on iOS
15+
+ */
16+
+ keyboardHandlingEnabled?: boolean;
17+
};
18+
19+
export type NativeStackNavigatorProps = DefaultNavigatorOptions<
20+
diff --git a/node_modules/@react-navigation/native-stack/src/views/NativeStackView.native.tsx b/node_modules/@react-navigation/native-stack/src/views/NativeStackView.native.tsx
21+
index a005c43..03d8b50 100644
22+
--- a/node_modules/@react-navigation/native-stack/src/views/NativeStackView.native.tsx
23+
+++ b/node_modules/@react-navigation/native-stack/src/views/NativeStackView.native.tsx
24+
@@ -161,6 +161,7 @@ const SceneView = ({
25+
statusBarTranslucent,
26+
statusBarColor,
27+
freezeOnBlur,
28+
+ keyboardHandlingEnabled,
29+
} = options;
30+
31+
let {
32+
@@ -289,6 +290,7 @@ const SceneView = ({
33+
onNativeDismissCancelled={onNativeDismissCancelled}
34+
// this prop is available since rn-screens 3.16
35+
freezeOnBlur={freezeOnBlur}
36+
+ hideKeyboardOnSwipe={keyboardHandlingEnabled}
37+
>
38+
<NavigationContext.Provider value={navigation}>
39+
<NavigationRouteContext.Provider value={route}>

‎patches/expo-av+13.10.4.patch

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/node_modules/expo-av/android/build.gradle b/node_modules/expo-av/android/build.gradle
2+
index 2d68ca6..c3fa3c5 100644
3+
--- a/node_modules/expo-av/android/build.gradle
4+
+++ b/node_modules/expo-av/android/build.gradle
5+
@@ -7,10 +7,11 @@ apply plugin: 'maven-publish'
6+
group = 'host.exp.exponent'
7+
version = '13.10.4'
8+
9+
+def REACT_NATIVE_PATH = this.hasProperty('reactNativeProject') ? this.reactNativeProject + '/node_modules/react-native/package.json' : 'react-native/package.json'
10+
def REACT_NATIVE_BUILD_FROM_SOURCE = findProject(":ReactAndroid") != null
11+
def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
12+
? findProject(":ReactAndroid").getProjectDir().parent
13+
- : new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).parent
14+
+ : new File(["node", "--print", "require.resolve('${REACT_NATIVE_PATH}')"].execute(null, rootDir).text.trim()).parent
15+
16+
def reactNativeArchitectures() {
17+
def value = project.getProperties().get("reactNativeArchitectures")

‎src/CONST.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,7 @@ const CONST = {
895895
DEFAULT_TIME_ZONE: {automatic: true, selected: 'America/Los_Angeles'},
896896
DEFAULT_ACCOUNT_DATA: {errors: null, success: '', isLoading: false},
897897
DEFAULT_CLOSE_ACCOUNT_DATA: {errors: null, success: '', isLoading: false},
898+
DEFAULT_NETWORK_DATA: {isOffline: false},
898899
FORMS: {
899900
LOGIN_FORM: 'LoginForm',
900901
VALIDATE_CODE_FORM: 'ValidateCodeForm',
@@ -951,6 +952,9 @@ const CONST = {
951952

952953
EMOJI_DEFAULT_SKIN_TONE: -1,
953954

955+
// Amount of emojis to render ahead at the end of the update cycle
956+
EMOJI_DRAW_AMOUNT: 250,
957+
954958
INVISIBLE_CODEPOINTS: ['fe0f', '200d', '2066'],
955959

956960
UNICODE: {
@@ -1555,6 +1559,7 @@ const CONST = {
15551559
WORKSPACE_TRAVEL: 'WorkspaceBookTravel',
15561560
WORKSPACE_MEMBERS: 'WorkspaceManageMembers',
15571561
WORKSPACE_BANK_ACCOUNT: 'WorkspaceBankAccount',
1562+
WORKSPACE_SETTINGS: 'WorkspaceSettings',
15581563
},
15591564
get EXPENSIFY_EMAILS() {
15601565
return [

0 commit comments

Comments
 (0)