Merge branch 'develop' into MHP-3132

src/actions/__tests__/navigation.ts

@@ -359,6 +359,84 @@ describe('navigateToCelebrateComments', () => {
     });
   });
 
+  describe('no celebrationItemId', () => {
+    describe('Cru org | undefined', () => {
+      beforeEach(() => {
+        store.dispatch<any>(navigateToCelebrateComments(cruOrg, undefined));
+      });
+
+      it('navigates to community celebrate feed if celebrationItemId is not present', () => {
+        expect(store.getActions()).toEqual([
+          {
+            type: 'Navigation/PUSH',
+            routeName: GROUP_SCREEN,
+            params: {
+              orgId: cruOrgId,
+              initialTab: undefined,
+            },
+          },
+        ]);
+      });
+    });
+
+    describe('Cru org | null', () => {
+      beforeEach(() => {
+        store.dispatch<any>(navigateToCelebrateComments(cruOrg, null));
+      });
+
+      it('navigates to community celebrate feed if celebrationItemId is not present', () => {
+        expect(store.getActions()).toEqual([
+          {
+            type: 'Navigation/PUSH',
+            routeName: GROUP_SCREEN,
+            params: {
+              orgId: cruOrgId,
+              initialTab: undefined,
+            },
+          },
+        ]);
+      });
+    });
+
+    describe('user-created Org | undefined', () => {
+      beforeEach(() => {
+        store.dispatch<any>(
+          navigateToCelebrateComments(userCreatedOrg, undefined),
+        );
+      });
+      it('navigates to community celebrate feed if celebrationItemId is not present', () => {
+        expect(store.getActions()).toEqual([
+          {
+            type: 'Navigation/PUSH',
+            routeName: USER_CREATED_GROUP_SCREEN,
+            params: {
+              orgId: userCreatedOrgId,
+              initialTab: undefined,
+            },
+          },
+        ]);
+      });
+    });
+
+    describe('user-created Org | null', () => {
+      beforeEach(() => {
+        store.dispatch<any>(navigateToCelebrateComments(userCreatedOrg, null));
+      });
+      it('navigates to community celebrate feed if celebrationItemId is not present', () => {
+        expect(store.getActions()).toEqual([
+          {
+            type: 'Navigation/PUSH',
+            routeName: USER_CREATED_GROUP_SCREEN,
+            params: {
+              orgId: userCreatedOrgId,
+              initialTab: undefined,
+            },
+          },
+        ]);
+      });
+    });
+  });
+
   describe('Cru org', () => {
     beforeEach(() => {
       store.dispatch<any>(navigateToCelebrateComments(cruOrg, celebrateItemId));

src/actions/__tests__/notifications.ts

@@ -779,6 +779,59 @@ describe('askNotificationPermissions', () => {
       });
     });
 
+    describe('celebrate_feed', () => {
+      it('should navigate to community celebrate feed', async () => {
+        await testNotification({
+          screen: 'celebrate_feed',
+          organization_id: organization.id,
+          screen_extra_data: {
+            celebration_item_id: undefined,
+          },
+        });
+
+        expect(refreshCommunity).toHaveBeenCalledWith(organization.id);
+        expect(navigateToCommunity).toHaveBeenCalledWith(organization);
+      });
+      it('should not navigate if no organization_id', async () => {
+        await testNotification({
+          screen: 'celebrate_feed',
+          organization_id: undefined,
+          screen_extra_data: {
+            celebration_item_id: undefined,
+          },
+        });
+
+        expect(refreshCommunity).not.toHaveBeenCalled();
+        expect(navigateToCommunity).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('celebrate_item', () => {
+      it('should navigate to CELEBRATION_DETAIL_SCREEN', async () => {
+        await testNotification({
+          screen: 'celebrate_item',
+          organization_id: organization.id,
+          screen_extra_data,
+        });
+
+        expect(refreshCommunity).toHaveBeenCalledWith(organization.id);
+        expect(navigateToCelebrateComments).toHaveBeenCalledWith(
+          organization,
+          celebration_item_id,
+        );
+      });
+      it('should not navigate if no organization_id', async () => {
+        await testNotification({
+          screen: 'celebrate_item',
+          organization_id: undefined,
+          screen_extra_data,
+        });
+
+        expect(refreshCommunity).not.toHaveBeenCalled();
+        expect(navigateToCelebrateComments).not.toHaveBeenCalled();
+      });
+    });
+
     describe('celebrate', () => {
       it('should look for stored org', async () => {
         await testNotification({

src/actions/navigation.ts

@@ -114,26 +114,30 @@ export function navigateToCommunity(
 
 export function navigateToCelebrateComments(
   community: Organization,
-  celebrationItemId: string,
+  celebrationItemId?: string | null,
 ) {
   return async (dispatch: ThunkDispatch<{}, null, AnyAction>) => {
     const orgId = community.id;
     const userCreated = orgIsUserCreated(community);
 
     const event = { id: celebrationItemId, organization: community };
 
-    await dispatch(
-      navigateNestedReset([
-        {
-          routeName: getScreenForOrg(orgId, userCreated),
-          params: { orgId },
-        },
-        {
-          routeName: GROUP_UNREAD_FEED_SCREEN,
-          params: { organization: community },
-        },
-        { routeName: CELEBRATE_DETAIL_SCREEN, params: { event } },
-      ]),
-    );
+    if (celebrationItemId) {
+      await dispatch(
+        navigateNestedReset([
+          {
+            routeName: getScreenForOrg(orgId, userCreated),
+            params: { orgId },
+          },
+          {
+            routeName: GROUP_UNREAD_FEED_SCREEN,
+            params: { organization: community },
+          },
+          { routeName: CELEBRATE_DETAIL_SCREEN, params: { event } },
+        ]),
+      );
+    } else {
+      dispatch(navigateToCommunity(community));
+    }
   };
 }

src/actions/notifications.ts

@@ -39,6 +39,7 @@ export function showNotificationPrompt(notificationType, doNotNavigateBack) {
     }
 
     return new Promise(resolve =>
+      // @ts-ignore
       PushNotification.checkPermissions(permission => {
         // Android does not need to ask user for notification permissions
         if (permission && permission.alert) {
@@ -95,6 +96,7 @@ export function configureNotificationHandler() {
   // @ts-ignore
   return (dispatch, getState) => {
     PushNotification.configure({
+      // @ts-ignore
       onRegister(t) {
         const { pushDevice } = getState().notifications;
 
@@ -107,7 +109,7 @@ export function configureNotificationHandler() {
       // @ts-ignore
       async onNotification(notification = {}) {
         await dispatch(handleNotification(notification));
-
+        // @ts-ignore
         notification.finish(PushNotificationIOS.FetchResult.NoData);
       },
       // ANDROID ONLY: GCM Sender ID
@@ -158,7 +160,13 @@ function handleNotification(notification) {
             organization: { id: organization_id },
           }),
         );
+      case 'celebrate_feed':
+        if (organization_id) {
+          const community = await dispatch(refreshCommunity(organization_id));
+          return dispatch(navigateToCommunity(community));
+        }
       case 'celebrate':
+      case 'celebrate_item':
         if (organization_id) {
           const community = await dispatch(refreshCommunity(organization_id));
           return dispatch(

src/containers/CelebrateFeed/__tests__/__snapshots__/CelebrateFeed.tsx.snap

@@ -1552,15 +1552,6 @@ exports[`renders for member renders correctly 1`] = `
           }
         }
       />
-      <ShareStoryInput
-        dispatch={[Function]}
-        organization={
-          Object {
-            "id": "456",
-          }
-        }
-        refreshItems={[Function]}
-      />
     </View>
     <View
       onLayout={[Function]}

src/containers/CelebrateFeed/index.tsx

@@ -144,11 +144,13 @@ const CelebrateFeed = ({
   const renderHeader = () => (
     <>
       <CelebrateFeedHeader isMember={!!person} organization={organization} />
-      <ShareStoryInput
-        dispatch={dispatch}
-        refreshItems={handleRefreshing}
-        organization={organization}
-      />
+      {!person ? (
+        <ShareStoryInput
+          dispatch={dispatch}
+          refreshItems={handleRefreshing}
+          organization={organization}
+        />
+      ) : null}
     </>
   );