Merge branch 'master' into tma258-sp-pagination-2

# Conflicts:
#	src/constants/api.ts
#	src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
#	src/services/SuggestedPeopleService.ts

1 files changed, 3 insertions, 4 deletions

diff --git a/src/components/common/SocialIcon.tsx b/src/components/common/SocialIcon.tsx
index 8216b6ff..cb3b926b 100644
--- a/src/components/common/SocialIcon.tsx
+++ b/src/components/common/SocialIcon.tsx
@@ -1,11 +1,10 @@
 import React from 'react';
 import {Image} from 'react-native';
-import {ScreenType} from '../../types';
 
 interface SocialIconProps {
   social: string;
   style: object;
-  screenType: ScreenType;
+  whiteRing: boolean | undefined;
 }
 /**
  * An image component that returns the <Image> of the icon for a specific social media platform.
@@ -13,12 +12,12 @@ interface SocialIconProps {
 const SocialIcon: React.FC<SocialIconProps> = ({
   social: social,
   style: style,
-  screenType,
+  whiteRing,
 }) => {
   switch (social) {
     case 'Instagram':
       var icon = require('../../assets/socials/instagram-icon.png');
-      if (screenType === ScreenType.SuggestedPeople) {
+      if (whiteRing) {
         icon = require('../../assets/socials/instagram-icon-white-bg.png');
       }
       break;