Merge branch 'master' into tma552-adjust-styles-and-sizes

# Conflicts:
#	src/screens/profile/MomentCommentsScreen.tsx

1 files changed, 14 insertions, 13 deletions

diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index b4eaa213..3e425101 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -54,7 +54,7 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
   })();
 
   const modalStyle: StackNavigationOptions = {
-    cardStyle: {backgroundColor: 'transparent'},
+    cardStyle: {backgroundColor: 'rgba(80,80,80,0.9)'},
     gestureDirection: 'vertical',
     cardOverlayEnabled: true,
     cardStyleInterpolator: ({current: {progress}}) => ({
@@ -64,14 +64,6 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
           outputRange: [0, 0.25, 0.7, 1],
         }),
       },
-      overlayStyle: {
-        backgroundColor: '#505050',
-        opacity: progress.interpolate({
-          inputRange: [0, 1],
-          outputRange: [0, 0.9],
-          extrapolate: 'clamp',
-        }),
-      },
     }),
   };
 
@@ -156,16 +148,25 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
         name="IndividualMoment"
         component={IndividualMoment}
         options={{
-          ...modalStyle,
+          gestureEnabled: false,
+          cardStyle: {
+            backgroundColor: 'rgba(0, 0, 0, 0.6)',
+          },
+          cardOverlayEnabled: true,
+          cardStyleInterpolator: ({current: {progress}}) => ({
+            cardStyle: {
+              opacity: progress.interpolate({
+                inputRange: [0, 0.5, 0.9, 1],
+                outputRange: [0, 0.25, 0.7, 1],
+              }),
+            },
+          }),
         }}
         initialParams={{screenType}}
       />
       <MainStack.Screen
         name="MomentCommentsScreen"
         component={MomentCommentsScreen}
-        options={{
-          ...modalStyle,
-        }}
         initialParams={{screenType}}
       />
       <MainStack.Screen