From 5907905cafe9c9fd1459743488ee72b32ee1435a Mon Sep 17 00:00:00 2001
From: Thu Nguyen <tmnguyen@berkeley.edu>
Date: Sun, 10 May 2020 20:53:18 -0700
Subject: [PATCH 1/4] clean up

---
 navigation/AppNavigator.js  |  8 --------
 navigation/DrawerContent.js | 11 +++++++++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/navigation/AppNavigator.js b/navigation/AppNavigator.js
index 3bdd4d46..cf493917 100644
--- a/navigation/AppNavigator.js
+++ b/navigation/AppNavigator.js
@@ -45,14 +45,6 @@ function DrawerNavigator() {
         component={StoresStackNavigator}
         options={{ title: 'Map', swipeEnabled: false }}
       />
-      <Drawer.Screen
-        name="Rewards"
-        component={RewardsStackNavigator}
-        options={{
-          title: 'Rewards',
-          drawerLockMode: 'locked-closed',
-        }}
-      />
       <Drawer.Screen
         name="Resources"
         component={ResourcesStackNavigator}
diff --git a/navigation/DrawerContent.js b/navigation/DrawerContent.js
index c8dc4755..2d368d58 100644
--- a/navigation/DrawerContent.js
+++ b/navigation/DrawerContent.js
@@ -5,7 +5,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { AsyncStorage, Linking, TouchableOpacity, View } from 'react-native';
 import * as Sentry from 'sentry-expo';
-
 import { Title } from '../components/BaseComponents';
 import Colors from '../constants/Colors';
 import { getCustomersById } from '../lib/airtable/request';
@@ -109,7 +108,15 @@ function DrawerContent(props) {
       </View>
       <DrawerItemList {...props} />
       <TouchableOpacity
-        style={{ padding: 8, height: 114 }}
+        style={{ padding: 8 }}
+        onPress={() => {
+          props.navigation.goBack();
+          props.navigation.navigate('RewardsOverlay');
+        }}>
+        <Title>Rewards</Title>
+      </TouchableOpacity>
+      <TouchableOpacity
+        style={{ padding: 8 }}
         onPress={() => Linking.openURL(link)}>
         <Title>Feedback</Title>
       </TouchableOpacity>

From aef295c0c84366cca06a4eede4cd9dd25477c17d Mon Sep 17 00:00:00 2001
From: Thu Nguyen <tmnguyen@berkeley.edu>
Date: Sun, 10 May 2020 20:55:32 -0700
Subject: [PATCH 2/4] removed rewards stack

---
 navigation/stack_navigators/RewardsStack.js | 44 ---------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 navigation/stack_navigators/RewardsStack.js

diff --git a/navigation/stack_navigators/RewardsStack.js b/navigation/stack_navigators/RewardsStack.js
deleted file mode 100644
index a5900705..00000000
--- a/navigation/stack_navigators/RewardsStack.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import {
-  CardStyleInterpolators,
-  createStackNavigator,
-} from '@react-navigation/stack';
-import React from 'react';
-import { Platform } from 'react-native';
-import { useSafeArea } from 'react-native-safe-area-context';
-import Colors from '../../constants/Colors';
-import RewardsScreen from '../../screens/rewards/RewardsScreen';
-
-const config = Platform.select({
-  web: { headerMode: 'screen' },
-  default: {
-    headerMode: 'none',
-  },
-});
-
-const RewardsStack = createStackNavigator();
-
-export default function RewardsStackNavigator() {
-  return (
-    <RewardsStack.Navigator
-      screenOptions={{
-        cardOverlayEnabled: true,
-        drawerLabel: 'Rewards',
-        gestureEnabled: true,
-        headerShown: false,
-        cardStyle: { backgroundColor: Colors.lightest },
-        config,
-      }}>
-      <RewardsStack.Screen
-        name="RewardsOverlay"
-        component={RewardsScreen}
-        options={{
-          cardStyleInterpolator: CardStyleInterpolators.forVerticalIOS,
-          gestureDirection: 'vertical',
-          gestureResponseDistance: {
-            vertical: 162 + useSafeArea().top,
-          },
-        }}
-      />
-    </RewardsStack.Navigator>
-  );
-}

From f363bd5286130ba52f3556ea19a53e1cda21c286 Mon Sep 17 00:00:00 2001
From: Annie Wang <anniedwang02@gmail.com>
Date: Sun, 10 May 2020 21:35:32 -0700
Subject: [PATCH 3/4] Removed rewards stack import

---
 navigation/AppNavigator.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/navigation/AppNavigator.js b/navigation/AppNavigator.js
index cf493917..3c446509 100644
--- a/navigation/AppNavigator.js
+++ b/navigation/AppNavigator.js
@@ -8,7 +8,6 @@ import AuthLoadingScreen from '../screens/auth/AuthLoadingScreen';
 import DrawerContent from './DrawerContent';
 import AuthStackNavigator from './stack_navigators/AuthStack';
 import ResourcesStackNavigator from './stack_navigators/ResourcesStack';
-import RewardsStackNavigator from './stack_navigators/RewardsStack';
 import StoresStackNavigator from './stack_navigators/StoresStack';
 
 const Drawer = createDrawerNavigator();

From eabfaacb648c1f315e47cc861eff89cc470501a4 Mon Sep 17 00:00:00 2001
From: Annie Wang <anniedwang02@gmail.com>
Date: Sun, 10 May 2020 21:36:01 -0700
Subject: [PATCH 4/4] Updated drawer

---
 navigation/DrawerContent.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/navigation/DrawerContent.js b/navigation/DrawerContent.js
index 2d368d58..fb16dfd7 100644
--- a/navigation/DrawerContent.js
+++ b/navigation/DrawerContent.js
@@ -108,17 +108,17 @@ function DrawerContent(props) {
       </View>
       <DrawerItemList {...props} />
       <TouchableOpacity
-        style={{ padding: 8 }}
+        style={{ paddingHorizontal: 8, paddingVertical: 13 }}
         onPress={() => {
           props.navigation.goBack();
           props.navigation.navigate('RewardsOverlay');
         }}>
-        <Title>Rewards</Title>
+        <Title style={{ height: 30 }}>Rewards</Title>
       </TouchableOpacity>
       <TouchableOpacity
-        style={{ padding: 8 }}
+        style={{ paddingHorizontal: 8, paddingVertical: 13 }}
         onPress={() => Linking.openURL(link)}>
-        <Title>Feedback</Title>
+        <Title style={{ height: 30 }}>Feedback</Title>
       </TouchableOpacity>
       <View
         style={{