Merge branch 'develop' into YV-275

Author: jorbuedo

apps/wallet-mobile/src/AppNavigator.tsx

@@ -56,7 +56,7 @@ const changeNavigationBarColor = (colorScheme: 'default-dark' | 'default-light',
 }
 
 export const AppNavigator = () => {
-  useInitNotifications({localEnabled: features.localNotifications, pushEnabled: features.pushNotifications})
+  useInitNotifications({localEnabled: true, pushEnabled: features.pushNotifications})
   useDeepLinkWatcher()
   const strings = useStrings()
   const [routeName, setRouteName] = React.useState<string>()

apps/wallet-mobile/src/features/Settings/useCases/changeWalletSettings/WalletSettingsScreen.tsx

@@ -11,7 +11,6 @@ import {SafeAreaView} from 'react-native-safe-area-context'
 import {Icon} from '../../../../components/Icon'
 import {Spacer} from '../../../../components/Spacer/Spacer'
 import {DIALOG_BUTTONS, showConfirmationDialog} from '../../../../kernel/dialogs'
-import {features} from '../../../../kernel/features'
 import {confirmationMessages} from '../../../../kernel/i18n/global-messages'
 import {useMetrics} from '../../../../kernel/metrics/metricsManager'
 import {SettingsRouteNavigation, useWalletNavigation} from '../../../../kernel/navigation'
@@ -137,17 +136,13 @@ export const WalletSettingsScreen = () => {
 
         <Spacer height={24} />
 
-        {features.localNotifications && (
-          <>
-            <SettingsSection title={strings.inAppNotifications}>
-              <SettingsItem icon={<Icon.Bell {...iconProps} />} label={strings.allowNotifications}>
-                <NotificationDisplaySwitcher />
-              </SettingsItem>
-            </SettingsSection>
-
-            <Spacer height={24} />
-          </>
-        )}
+        <SettingsSection title={strings.inAppNotifications}>
+          <SettingsItem icon={<Icon.Bell {...iconProps} />} label={strings.allowNotifications}>
+            <NotificationDisplaySwitcher />
+          </SettingsItem>
+        </SettingsSection>
+
+        <Spacer height={24} />
 
         <SettingsSection title={strings.about}>
           <SettingsBuildItem label={strings.walletType} value={intl.formatMessage(getWalletType(implementation))} />

apps/wallet-mobile/src/kernel/features.ts

@@ -5,7 +5,6 @@ export const features = {
   prefillWalletInfo: false,
   showProdPoolsInDev: isDev,
   moderatingNftsEnabled: false,
-  localNotifications: true,
   pushNotifications: isDev,
   poolTransition: true,
   portfolioPerformance: false,

apps/wallet-mobile/translations/messages/src/AppNavigator.json

@@ -6,12 +6,12 @@
     "start": {
       "line": 261,
       "column": 17,
-      "index": 9836
+      "index": 9813
     },
     "end": {
       "line": 264,
       "column": 3,
-      "index": 9926
+      "index": 9903
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 265,
       "column": 18,
-      "index": 9946
+      "index": 9923
     },
     "end": {
       "line": 268,
       "column": 3,
-      "index": 10044
+      "index": 10021
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 269,
       "column": 25,
-      "index": 10071
+      "index": 10048
     },
     "end": {
       "line": 272,
       "column": 3,
-      "index": 10185
+      "index": 10162
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 273,
       "column": 27,
-      "index": 10214
+      "index": 10191
     },
     "end": {
       "line": 276,
       "column": 3,
-      "index": 10335
+      "index": 10312
     }
   }
 ]