Skip to content

Commit fa9567b

Browse files
committed
Merge remote-tracking branch 'exfy/main' into decompose/composer-pr8-text-ownership
2 parents 134d974 + 5d094c0 commit fa9567b

198 files changed

Lines changed: 6589 additions & 1825 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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
const useCameraDevice = jest.fn(() => null);
2+
const useCameraFormat = jest.fn(() => null);
3+
const useCameraPermission = jest.fn(() => ({hasPermission: false, requestPermission: jest.fn(() => Promise.resolve(false))}));
4+
5+
const Camera = Object.assign(
6+
jest.fn(() => null),
7+
{
8+
getCameraPermissionStatus: jest.fn(() => 'not-determined'),
9+
requestCameraPermission: jest.fn(() => Promise.resolve('granted')),
10+
},
11+
);
12+
13+
export {Camera, useCameraDevice, useCameraFormat, useCameraPermission};

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ android {
111111
minSdkVersion rootProject.ext.minSdkVersion
112112
targetSdkVersion rootProject.ext.targetSdkVersion
113113
multiDexEnabled rootProject.ext.multiDexEnabled
114-
versionCode 1009036801
115-
versionName "9.3.68-1"
114+
versionCode 1009036802
115+
versionName "9.3.68-2"
116116
// Supported language variants must be declared here to avoid from being removed during the compilation.
117117
// This also helps us to not include unnecessary language variants in the APK.
118118
resConfigs "en", "es"

assets/images/camera-flip.svg

Lines changed: 1 addition & 0 deletions
Loading

config/eslint/eslint.seatbelt.tsv

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -458,13 +458,7 @@
458458
"../../src/pages/ReimbursementAccount/EnterSignerInfo/index.tsx" "@typescript-eslint/no-deprecated/useSubStep" 1
459459
"../../src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx" "react-hooks/refs" 3
460460
"../../src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx" "react-hooks/set-state-in-effect" 4
461-
"../../src/pages/ReimbursementAccount/USD/BankInfo/BankInfo.tsx" "@typescript-eslint/no-deprecated/useSubStep" 1
462-
"../../src/pages/ReimbursementAccount/USD/BeneficialOwnerInfo/BeneficialOwnersStep.tsx" "@typescript-eslint/no-deprecated/useSubStep" 1
463-
"../../src/pages/ReimbursementAccount/USD/BeneficialOwnerInfo/subSteps/BeneficialOwnerDetailsFormSubSteps/ConfirmationUBO.tsx" "no-restricted-syntax" 1
464-
"../../src/pages/ReimbursementAccount/USD/BusinessInfo/BusinessInfo.tsx" "@typescript-eslint/no-deprecated/useSubStep" 1
465461
"../../src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/IndustryCode/IndustryCodeSelector.tsx" "react-hooks/set-state-in-effect" 1
466-
"../../src/pages/ReimbursementAccount/USD/CompleteVerification/CompleteVerification.tsx" "@typescript-eslint/no-deprecated/useSubStep" 1
467-
"../../src/pages/ReimbursementAccount/USD/Requestor/PersonalInfo/PersonalInfo.tsx" "@typescript-eslint/no-deprecated/useSubStep" 1
468462
"../../src/pages/ReportDescriptionPage.tsx" "no-restricted-syntax" 1
469463
"../../src/pages/ReportDetailsPage.tsx" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
470464
"../../src/pages/ReportDetailsPage.tsx" "react-hooks/preserve-manual-memoization" 4

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.3.68.1</string>
47+
<string>9.3.68.2</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.3.68</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.68.1</string>
16+
<string>9.3.68.2</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.3.68</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.68.1</string>
16+
<string>9.3.68.2</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.3.68-1",
3+
"version": "9.3.68-2",
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.",

0 commit comments

Comments
 (0)