Skip to content

Commit abecba5

Browse files
srikarparsisrikarparsi
authored
Merge branch 'main' into refactor/option-row-subtitle
2 parents 1de58ca + 59c9a0e commit abecba5

135 files changed

Lines changed: 1726 additions & 1377 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‎

‎__mocks__/reportData/violations.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ const receiptErrorsR14932: ReceiptErrors = {
3333
transactionID: RECEIPT_ERRORS_TRANSACTION_ID_R14932,
3434
source: CONST.POLICY.ID_FAKE,
3535
transactionPolicy: undefined,
36+
transactionPolicyTagList: undefined,
3637
},
3738
},
3839
};

‎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 1009036906
115-
versionName "9.3.69-6"
114+
versionCode 1009036913
115+
versionName "9.3.69-13"
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/simple-illustrations/simple-illustration__calculator-money.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎config/eslint/eslint.seatbelt.tsv‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@
343343
"../../src/libs/actions/IOU/PerDiem.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 2
344344
"../../src/libs/actions/IOU/PerDiem.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 1
345345
"../../src/libs/actions/IOU/PerDiem.ts" "no-restricted-syntax" 2
346-
"../../src/libs/actions/IOU/Receipt.ts" "@typescript-eslint/no-deprecated/getPolicyTagsData" 1
347346
"../../src/libs/actions/IOU/Receipt.ts" "no-restricted-syntax" 1
348347
"../../src/libs/actions/IOU/RejectMoneyRequest.ts" "@typescript-eslint/no-deprecated/buildNextStepNew" 2
349348
"../../src/libs/actions/IOU/RejectMoneyRequest.ts" "no-restricted-syntax" 1
@@ -355,7 +354,6 @@
355354
"../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 4
356355
"../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/Localize.translateLocal" 2
357356
"../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/getMoneyRequestPolicyTags" 1
358-
"../../src/libs/actions/IOU/Split.ts" "@typescript-eslint/no-deprecated/getPolicyTagsData" 1
359357
"../../src/libs/actions/IOU/Split.ts" "no-restricted-syntax" 3
360358
"../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "@typescript-eslint/no-deprecated/InteractionManager.runAfterInteractions" 1
361359
"../../src/libs/actions/IOU/SplitTransactionUpdate.ts" "@typescript-eslint/no-deprecated/getMoneyRequestPolicyTags" 1

‎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.69.6</string>
47+
<string>9.3.69.13</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.69</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.69.6</string>
16+
<string>9.3.69.13</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

‎ios/Podfile.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3878,7 +3878,7 @@ PODS:
38783878
- ReactCommon/turbomodule/core
38793879
- SocketRocket
38803880
- Yoga
3881-
- RNReanimated (4.2.1):
3881+
- RNReanimated (4.2.3):
38823882
- boost
38833883
- DoubleConversion
38843884
- fast_float
@@ -3905,11 +3905,11 @@ PODS:
39053905
- ReactCodegen
39063906
- ReactCommon/turbomodule/bridging
39073907
- ReactCommon/turbomodule/core
3908-
- RNReanimated/reanimated (= 4.2.1)
3908+
- RNReanimated/reanimated (= 4.2.3)
39093909
- RNWorklets
39103910
- SocketRocket
39113911
- Yoga
3912-
- RNReanimated/reanimated (4.2.1):
3912+
- RNReanimated/reanimated (4.2.3):
39133913
- boost
39143914
- DoubleConversion
39153915
- fast_float
@@ -3936,11 +3936,11 @@ PODS:
39363936
- ReactCodegen
39373937
- ReactCommon/turbomodule/bridging
39383938
- ReactCommon/turbomodule/core
3939-
- RNReanimated/reanimated/apple (= 4.2.1)
3939+
- RNReanimated/reanimated/apple (= 4.2.3)
39403940
- RNWorklets
39413941
- SocketRocket
39423942
- Yoga
3943-
- RNReanimated/reanimated/apple (4.2.1):
3943+
- RNReanimated/reanimated/apple (4.2.3):
39443944
- boost
39453945
- DoubleConversion
39463946
- fast_float
@@ -4933,7 +4933,7 @@ SPEC CHECKSUMS:
49334933
RNNitroSQLite: a9b5965d511ed6e99ce903380e64934d043a0d2c
49344934
RNPermissions: 518f0a0c439acc74e2b9937e0e7d29e5031ae949
49354935
RNReactNativeHapticFeedback: 5f1542065f0b24c9252bd8cf3e83bc9c548182e4
4936-
RNReanimated: fbcb7fd8da5b0b088401542c58fb5d266388f1cf
4936+
RNReanimated: a0068c25e0b27d5418d66289a915f53eb97380df
49374937
RNScreens: 4f2aed147a2775017923789d8a0a2d377712ec2e
49384938
RNSentry: f73f4da92e4c20841ab16e1fa22fc289bc2f9f4e
49394939
RNShare: 1c1fde2c4134b9cf220ffebbd6df9c414036d382

‎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.69</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.3.69.6</string>
16+
<string>9.3.69.13</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

‎package-lock.json‎

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

0 commit comments

Comments
 (0)