notif: Drop result and msg from pushToken state.

We never actually use these; and outside of bugs, there's no
interesting information the server returns anyway for them to store.
For investigating bugs, we have a wide variety of other tools.

Author: gnprice

src/boot/store.js

@@ -60,6 +60,16 @@ const migrations = {
     messages: {},
     narrows: {},
   }),
+  '2': state => ({
+    ...state,
+    realm: {
+      ...state.realm,
+      pushToken: {
+        token: state.realm.pushToken.token,
+        // Drop `result` and `msg`.
+      },
+    },
+  }),
 };
 
 const reduxPersistConfig: Config = {

src/diagnostics/NotificationDiagScreen.js

@@ -1,25 +1,14 @@
 /* @flow strict-local */
-import { connect } from 'react-redux';
-
 import React, { PureComponent } from 'react';
 import { FlatList } from 'react-native';
 
-import type { GlobalState } from '../types';
 import { Screen } from '../common';
 import config from '../config';
 import InfoItem from './InfoItem';
-import { getRealm } from '../selectors';
-
-type Props = {|
-  pushToken: { token: string, msg: string, result: string },
-|};
 
-class NotificationDiagScreen extends PureComponent<Props> {
+export default class NotificationDiagScreen extends PureComponent<{||}> {
   render() {
-    const { pushToken } = this.props;
     const variables = {
-      Result: pushToken.result,
-      Message: pushToken.msg,
       'Initial notification': JSON.stringify(config.startup.notification),
     };
     return (
@@ -33,7 +22,3 @@ class NotificationDiagScreen extends PureComponent<Props> {
     );
   }
 }
-
-export default connect((state: GlobalState) => ({
-  pushToken: getRealm(state).pushToken,
-}))(NotificationDiagScreen);

src/realm/__tests__/realmReducers-test.js

@@ -25,7 +25,7 @@ describe('realmReducers', () => {
         crossRealmBots: [],
         isAdmin: false,
         twentyFourHourTime: false,
-        pushToken: { token: '', result: '', msg: '' },
+        pushToken: { token: '' },
         emoji: {},
         filters: [],
         nonActiveUsers: [],
@@ -41,7 +41,7 @@ describe('realmReducers', () => {
     test('save a new PUSH token', () => {
       const initialState = deepFreeze({
         twentyFourHourTime: false,
-        pushToken: { token: '', result: '', msg: '' },
+        pushToken: { token: '' },
         emoji: { customEmoji1: {} },
       });
 
@@ -54,7 +54,7 @@ describe('realmReducers', () => {
 
       const expectedState = {
         twentyFourHourTime: false,
-        pushToken: { token: 'new-key', result: 'b', msg: 'a' },
+        pushToken: { token: 'new-key' },
         emoji: { customEmoji1: {} },
       };
 
@@ -68,7 +68,7 @@ describe('realmReducers', () => {
     test('delete the PUSH token', () => {
       const initialState = deepFreeze({
         twentyFourHourTime: false,
-        pushToken: { token: 'old-key', result: '', msg: '' },
+        pushToken: { token: 'old-key' },
         emoji: { customEmoji1: {} },
       });
 
@@ -78,7 +78,7 @@ describe('realmReducers', () => {
 
       const expectedState = {
         twentyFourHourTime: false,
-        pushToken: { token: '', result: '', msg: '' },
+        pushToken: { token: '' },
         emoji: { customEmoji1: {} },
       };
 
@@ -92,7 +92,7 @@ describe('realmReducers', () => {
     test('change the display settings', () => {
       const initialState = deepFreeze({
         twentyFourHourTime: false,
-        pushToken: { token: '', result: '', msg: '' },
+        pushToken: { token: '' },
         emoji: { customEmoji1: {} },
       });
 
@@ -107,7 +107,7 @@ describe('realmReducers', () => {
 
       const expectedState = {
         twentyFourHourTime: true,
-        pushToken: { token: '', result: '', msg: '' },
+        pushToken: { token: '' },
         emoji: { customEmoji1: {} },
       };
 
@@ -121,7 +121,7 @@ describe('realmReducers', () => {
     test('update state to new realm_emoji', () => {
       const prevState = deepFreeze({
         twentyFourHourTime: false,
-        pushToken: { token: '', result: '', msg: '' },
+        pushToken: { token: '' },
         emoji: {},
         filter: [],
       });
@@ -139,7 +139,7 @@ describe('realmReducers', () => {
 
       const expectedState = {
         twentyFourHourTime: false,
-        pushToken: { token: '', result: '', msg: '' },
+        pushToken: { token: '' },
         emoji: {
           customEmoji1: {},
           customEmoji2: {},
@@ -157,7 +157,7 @@ describe('realmReducers', () => {
     test('update state to new realm_filter', () => {
       const prevState = deepFreeze({
         twentyFourHourTime: false,
-        pushToken: { token: '', result: '', msg: '' },
+        pushToken: { token: '' },
         emoji: {},
         filters: [],
       });
@@ -172,7 +172,7 @@ describe('realmReducers', () => {
 
       const expectedState = {
         twentyFourHourTime: false,
-        pushToken: { token: '', result: '', msg: '' },
+        pushToken: { token: '' },
         emoji: {},
         filters: [['#(?P<id>[0-9]+)', 'https://github.com/zulip/zulip/issues/%(id)s', 2]],
       };

src/realm/realmReducers.js

@@ -31,7 +31,7 @@ const initialState = {
   canCreateStreams: true,
   crossRealmBots: [],
   twentyFourHourTime: false,
-  pushToken: { token: '', result: '', msg: '' },
+  pushToken: { token: '' },
   emoji: {},
   filters: [],
   isAdmin: false,
@@ -53,20 +53,18 @@ const saveTokenPush = (state: RealmState, action: SaveTokenPushAction): RealmSta
   ...state,
   pushToken: {
     token: action.pushToken,
-    result: action.result,
-    msg: action.msg,
   },
 });
 
 const deleteTokenPush = (state: RealmState, action: DeleteTokenPushAction): RealmState => ({
   ...state,
-  pushToken: { token: '', result: '', msg: '' },
+  pushToken: { token: '' },
 });
 
 const loginChange = (state: RealmState, action: LoginSuccessAction | LogoutAction): RealmState => ({
   ...state,
   emoji: {},
-  pushToken: { token: '', result: '', msg: '' },
+  pushToken: { token: '' },
 });
 
 const initRealmEmoji = (state: RealmState, action: InitRealmEmojiAction): RealmState => ({

src/types.js

@@ -352,8 +352,6 @@ export type RealmState = {|
   nonActiveUsers: User[],
   pushToken: {|
     token: string,
-    msg: string,
-    result: string,
   |},
   filters: RealmFilter[],
   emoji: RealmEmojiState,