Beta - Apr 6 2020 (#626)

* VC-1368 - Create interactions for videos when the videos are started, paused, resumed and finished (#611) https://jesusfilmmedia.atlassian.net/browse/VC-1368 * VC-1412: Change Blocking Endpoint (#620) https://jesusfilmmedia.atlassian.net/browse/VC-1412 * VC-1408: When joining the group it’s not showing users modal (#618) https://jesusfilmmedia.atlassian.net/browse/VC-1408 * VC-1403: Invite link screen looks bad (#619) https://jesusfilmmedia.atlassian.net/browse/VC-1403 * VC-1407: UI Language won’t be the same after app restart (#617) https://jesusfilmmedia.atlassian.net/browse/VC-1407 * VC-1406: Existing Reactions are missing on android (#615) * VC-1406: Existing Reactions are missing on android https://jesusfilmmedia.atlassian.net/browse/VC-1406 * VC-1360: Exiting out of message context not working every time https://jesusfilmmedia.atlassian.net/browse/VC-1360 * VC-1405: Can’t select reaction on android https://jesusfilmmedia.atlassian.net/browse/VC-1405 * VC-1404: New reactions won’t appear for other users without refresh (#616) https://jesusfilmmedia.atlassian.net/browse/VC-1404 * build(deps): bump swiperefreshlayout from 1.0.0 to 1.1.0 in /android (#582) Bumps swiperefreshlayout from 1.0.0 to 1.1.0. * VC-1418: Leader Zone > Step > Users Modal - Can’t exit out of this modal (#624) https://jesusfilmmedia.atlassian.net/browse/VC-1418 * VC-1417: Main question card > Footer > Invalid date (#623) https://jesusfilmmedia.atlassian.net/browse/VC-1417 * My Adventures > Have an Adventure Code link unstyled (#622) https://jesusfilmmedia.atlassian.net/browse/VC-1413 * VC-1416 Fullscreen Video on Android (#625) https://jesusfilmmedia.atlassian.net/browse/VC-1416
CruGlobal · Apr 6, 2021 · 295f75e · 295f75e
1 parent 942eea7
commit 295f75e
Show file tree

Hide file tree

Showing 13 changed files with 190 additions and 173 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -44,6 +44,7 @@
           "vokebot_action",
           "organization_journeys",
           "page_number",
+          "preview_journey_url",
           "gating_period",
           "total_pages",
           "total_count",

diff --git a/android/app/src/main/java/org/cru/voke/MainActivity.java b/android/app/src/main/java/org/cru/voke/MainActivity.java
@@ -7,6 +7,7 @@
 // https://jeremybarbet.github.io/react-native-modalize/#/INSTALLATION
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.ReactRootView;
+import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 // Voke: RN Orientation Locker
 // https://github.com/wonday/react-native-orientation-locker#android
 import android.content.Intent;
@@ -39,4 +40,16 @@ public void onConfigurationChanged(Configuration newConfig) {
   protected String getMainComponentName() {
     return "Voke";
   }
+
+  // React Native Gesture Handler
+  // https://docs.swmansion.com/react-native-gesture-handler/docs/#updating-mainactivityjava
+  @Override
+  protected ReactActivityDelegate createReactActivityDelegate() {
+    return new ReactActivityDelegate(this, getMainComponentName()) {
+      @Override
+      protected ReactRootView createRootView() {
+       return new RNGestureHandlerEnabledRootView(MainActivity.this);
+      }
+    };
+  }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -111,7 +111,9 @@
     "@testing-library/jest-native": "^3.4.3",
     "@testing-library/react-native": "^7.1.0",
     "@types/jest": "^26.0.19",
+    "@types/react-native-communications": "^2.2.1",
     "@types/react-native-material-menu": "^1.0.3",
+    "@types/react-native-video": "^5.0.4",
     "@types/react-redux": "^7.1.15",
     "@types/react-test-renderer": "^16.9.2",
     "@types/redux-mock-store": "^1.0.2",

diff --git a/src/actions/info.ts b/src/actions/info.ts
@@ -24,10 +24,10 @@ export function toastAction(text: string, length?: 'long' | 'short' | null) {
   };
 }
 
-type setCurrentScreenProps = {
+interface setCurrentScreenProps {
   screen: string;
-  data: object;
-};
+  data?: object;
+}
 export function setCurrentScreen({ screen, data }: setCurrentScreenProps) {
   return async (dispatch: Dispatch, getState: any) => {
     dispatch({

diff --git a/src/components/DateComponent/index.js → src/components/DateComponent/index.tsx b/src/components/DateComponent/index.js → src/components/DateComponent/index.tsx
@@ -1,15 +1,20 @@
-import React from 'react';
+import React, { ReactElement } from 'react';
 import moment from 'moment';
 import { isString, momentUtc } from 'utils';
 
 import Text from '../Text';
 
-function DateComponent({ date, format = 'ddd, lll', ...rest }) {
+function DateComponent({
+  date = '',
+  format = 'ddd, lll',
+  ...rest
+}): ReactElement {
   let text;
   if (isString(date) && date.indexOf('UTC') >= 0) {
     text = momentUtc(date).local().format(format);
   } else {
-    text = moment(date).format(format);
+    const messageDate = moment(date);
+    text = messageDate.isValid() ? moment(date).format(format) : '';
   }
   return <Text {...rest}>{text}</Text>;
 }