From d9228da7d7803c9ad271ae8de63b9b9a07ac8731 Mon Sep 17 00:00:00 2001
From: Zhiyuan Zheng <me@xmflsct.com>
Date: Wed, 15 Dec 2021 23:22:47 +0100
Subject: [PATCH] Moved push notification place

---
 src/i18n/en/screens/tabs.json                  |  6 ++++++
 src/i18n/zh-Hans/screens/tabs.json             |  6 ++++++
 src/screens/Announcements.tsx                  |  7 ++++---
 src/screens/Tabs/Me/Root/Collections.tsx       | 17 +++++++++++++++++
 .../Shared/Account/Information/Actions.tsx     | 18 +-----------------
 5 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/i18n/en/screens/tabs.json b/src/i18n/en/screens/tabs.json
index d19afc80..79d5b652 100644
--- a/src/i18n/en/screens/tabs.json
+++ b/src/i18n/en/screens/tabs.json
@@ -185,6 +185,12 @@
           "empty": "None"
         }
       },
+      "push": {
+        "content": {
+          "enabled": "Enabled",
+          "disabled": "Disabled"
+        }
+      },
       "update": {
         "title": "Update to latest version"
       },
diff --git a/src/i18n/zh-Hans/screens/tabs.json b/src/i18n/zh-Hans/screens/tabs.json
index 95e2e6a1..e9dc4611 100644
--- a/src/i18n/zh-Hans/screens/tabs.json
+++ b/src/i18n/zh-Hans/screens/tabs.json
@@ -185,6 +185,12 @@
           "empty": "无公告"
         }
       },
+      "push": {
+        "content": {
+          "enabled": "已启用",
+          "disabled": "未启用"
+        }
+      },
       "update": {
         "title": "更新至最新版本"
       },
diff --git a/src/screens/Announcements.tsx b/src/screens/Announcements.tsx
index 734969dc..a00f0a72 100644
--- a/src/screens/Announcements.tsx
+++ b/src/screens/Announcements.tsx
@@ -20,9 +20,9 @@ import FastImage from 'react-native-fast-image'
 import { FlatList, ScrollView } from 'react-native-gesture-handler'
 import { SafeAreaView } from 'react-native-safe-area-context'
 
-const ScreenAnnouncements: React.FC<RootStackScreenProps<
-  'Screen-Announcements'
->> = ({
+const ScreenAnnouncements: React.FC<
+  RootStackScreenProps<'Screen-Announcements'>
+> = ({
   route: {
     params: { showAll = false }
   },
@@ -250,6 +250,7 @@ const styles = StyleSheet.create({
   announcementContainer: {
     width: Dimensions.get('screen').width,
     padding: StyleConstants.Spacing.Global.PagePadding,
+    marginVertical: StyleConstants.Spacing.Global.PagePadding,
     justifyContent: 'center'
   },
   published: {
diff --git a/src/screens/Tabs/Me/Root/Collections.tsx b/src/screens/Tabs/Me/Root/Collections.tsx
index 2a8b4891..28a4da7d 100644
--- a/src/screens/Tabs/Me/Root/Collections.tsx
+++ b/src/screens/Tabs/Me/Root/Collections.tsx
@@ -3,6 +3,7 @@ import { useNavigation } from '@react-navigation/native'
 import { useAnnouncementQuery } from '@utils/queryHooks/announcement'
 import { useListsQuery } from '@utils/queryHooks/lists'
 import { getMePage, updateContextMePage } from '@utils/slices/contextsSlice'
+import { getInstancePush } from '@utils/slices/instancesSlice'
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useDispatch, useSelector } from 'react-redux'
@@ -53,6 +54,11 @@ const Collections: React.FC = () => {
     }
   }, [announcementsQuery.isSuccess, announcementsQuery.data?.length])
 
+  const instancePush = useSelector(
+    getInstancePush,
+    (prev, next) => prev?.global.value === next?.global.value
+  )
+
   return (
     <MenuContainer>
       <MenuRow
@@ -98,6 +104,17 @@ const Collections: React.FC = () => {
           }
         />
       ) : null}
+      <MenuRow
+        iconFront={instancePush ? 'Bell' : 'BellOff'}
+        iconBack='ChevronRight'
+        title={t('me.stacks.push.name')}
+        content={
+          instancePush
+            ? t('me.root.push.content.enabled')
+            : t('me.root.push.content.disabled')
+        }
+        onPress={() => navigation.navigate('Tab-Me-Push')}
+      />
     </MenuContainer>
   )
 }
diff --git a/src/screens/Tabs/Shared/Account/Information/Actions.tsx b/src/screens/Tabs/Shared/Account/Information/Actions.tsx
index 22f6f36a..93466821 100644
--- a/src/screens/Tabs/Shared/Account/Information/Actions.tsx
+++ b/src/screens/Tabs/Shared/Account/Information/Actions.tsx
@@ -3,10 +3,7 @@ import Button from '@components/Button'
 import { RelationshipOutgoing } from '@components/Relationship'
 import { useNavigation } from '@react-navigation/native'
 import { useRelationshipQuery } from '@utils/queryHooks/relationship'
-import {
-  getInstanceAccount,
-  getInstancePush
-} from '@utils/slices/instancesSlice'
+import { getInstanceAccount } from '@utils/slices/instancesSlice'
 import { StyleConstants } from '@utils/styles/constants'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
@@ -56,7 +53,6 @@ const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => {
           content={t('shared.account.moved')}
           onPress={() => {
             analytics('account_gotomoved_press')
-            // @ts-ignore
             navigation.push('Tab-Shared-Account', { account: accountMoved })
           }}
         />
@@ -64,21 +60,9 @@ const AccountInformationActions: React.FC<Props> = ({ account, myInfo }) => {
     )
   }
 
-  const instancePush = useSelector(
-    getInstancePush,
-    (prev, next) => prev?.global.value === next?.global.value
-  )
-
   if (myInfo) {
     return (
       <View style={styles.base}>
-        <Button
-          round
-          type='icon'
-          content={instancePush?.global.value ? 'Bell' : 'BellOff'}
-          style={styles.actionLeft}
-          onPress={() => navigation.navigate('Tab-Me-Push')}
-        />
         <Button
           type='text'
           disabled={account === undefined}