Merge branch 'master' into tma626-people-tutorial

# Conflicts:
#	src/screens/suggestedPeople/SuggestedPeopleScreen.tsx

1 files changed, 13 insertions, 5 deletions

diff --git a/src/components/notifications/Notification.tsx b/src/components/notifications/Notification.tsx
index 1073a479..f83abcbc 100644
--- a/src/components/notifications/Notification.tsx
+++ b/src/components/notifications/Notification.tsx
@@ -24,7 +24,12 @@ import {
   ThreadNotificationType,
   UserType,
 } from '../../types';
-import {fetchUserX, SCREEN_HEIGHT, userXInStore} from '../../utils';
+import {
+  fetchUserX,
+  SCREEN_HEIGHT,
+  SCREEN_WIDTH,
+  userXInStore,
+} from '../../utils';
 import AcceptDeclineButtons from '../common/AcceptDeclineButtons';
 
 interface NotificationProps {
@@ -251,12 +256,14 @@ const styles = StyleSheet.create({
   container: {
     flexDirection: 'row',
     height: Math.round(SCREEN_HEIGHT / 10),
+    width: SCREEN_WIDTH * 0.9,
     flex: 1,
+    alignSelf: 'center',
     alignItems: 'center',
   },
   avatarContainer: {
-    marginLeft: '8%',
-    flex: 1,
+    height: 42,
+    width: 42,
     justifyContent: 'center',
   },
   avatar: {
@@ -270,7 +277,6 @@ const styles = StyleSheet.create({
     height: '80%',
     flexDirection: 'column',
     justifyContent: 'space-around',
-    marginRight: '15%',
   },
   actorName: {
     fontSize: 15,
@@ -282,7 +288,9 @@ const styles = StyleSheet.create({
     width: 42,
     right: '5%',
   },
-  buttonsContainer: {},
+  buttonsContainer: {
+    height: '80%',
+  },
 });
 
 export default Notification;