Skip to content

Commit ab7e7f2

Browse files
committed
Merge branch 'main' into feature/kuba_nowakowski/add_switch_animations_to_acounting
2 parents 688df4f + d2ffb9c commit ab7e7f2

File tree

11 files changed

+24
-11
lines changed

11 files changed

+24
-11
lines changed

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ android {
110110
minSdkVersion rootProject.ext.minSdkVersion
111111
targetSdkVersion rootProject.ext.targetSdkVersion
112112
multiDexEnabled rootProject.ext.multiDexEnabled
113-
versionCode 1009008802
114-
versionName "9.0.88-2"
113+
versionCode 1009008803
114+
versionName "9.0.88-3"
115115
// Supported language variants must be declared here to avoid from being removed during the compilation.
116116
// This also helps us to not include unnecessary language variants in the APK.
117117
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.0.88.2</string>
47+
<string>9.0.88.3</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</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>9.0.88.2</string>
22+
<string>9.0.88.3</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>9.0.88</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.0.88.2</string>
16+
<string>9.0.88.3</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

modules/background-task/android/src/main/java/com/expensify/reactnativebackgroundtask/ReactNativeBackgroundTaskModule.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import android.content.ComponentName
1111
import android.content.Context
1212
import android.content.Intent
1313
import android.content.IntentFilter
14+
import android.os.Build
1415
import android.os.PersistableBundle
1516
import android.util.Log
1617

@@ -27,7 +28,13 @@ class ReactNativeBackgroundTaskModule internal constructor(context: ReactApplica
2728

2829
init {
2930
val filter = IntentFilter("com.expensify.reactnativebackgroundtask.TASK_ACTION")
30-
reactApplicationContext.registerReceiver(taskReceiver, filter)
31+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
32+
reactApplicationContext.registerReceiver(
33+
taskReceiver,
34+
filter,
35+
Context.RECEIVER_EXPORTED
36+
)
37+
}
3138
}
3239

3340
override fun getName(): String {

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.0.88-2",
3+
"version": "9.0.88-3",
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.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,7 @@ const CONST = {
660660
PER_DIEM: 'newDotPerDiem',
661661
NEWDOT_MERGE_ACCOUNTS: 'newDotMergeAccounts',
662662
NEWDOT_MANAGER_MCTEST: 'newDotManagerMcTest',
663+
NSQS: 'nsqs',
663664
},
664665
BUTTON_STATES: {
665666
DEFAULT: 'default',

src/libs/Permissions.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ function canUseManagerMcTest(betas: OnyxEntry<Beta[]>): boolean {
4141
return !!betas?.includes(CONST.BETAS.NEWDOT_MANAGER_MCTEST) || canUseAllBetas(betas);
4242
}
4343

44+
function canUseNSQS(betas: OnyxEntry<Beta[]>): boolean {
45+
return !!betas?.includes(CONST.BETAS.NSQS) || canUseAllBetas(betas);
46+
}
47+
4448
export default {
4549
canUseDefaultRooms,
4650
canUseLinkPreviews,
@@ -50,4 +54,5 @@ export default {
5054
canUsePerDiem,
5155
canUseMergeAccounts,
5256
canUseManagerMcTest,
57+
canUseNSQS,
5358
};

0 commit comments

Comments
 (0)