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, 6 insertions, 4 deletions

diff --git a/src/components/taggs/TaggsBar.tsx b/src/components/taggs/TaggsBar.tsx
index c23f56a9..05ee18bb 100644
--- a/src/components/taggs/TaggsBar.tsx
+++ b/src/components/taggs/TaggsBar.tsx
@@ -20,12 +20,14 @@ interface TaggsBarProps {
   profileBodyHeight: number;
   userXId: string | undefined;
   screenType: ScreenType;
+  whiteRing: boolean | undefined;
 }
 const TaggsBar: React.FC<TaggsBarProps> = ({
   y,
   profileBodyHeight,
   userXId,
   screenType,
+  whiteRing,
 }) => {
   let [taggs, setTaggs] = useState<Object[]>([]);
   let [taggsNeedUpdate, setTaggsNeedUpdate] = useState(true);
@@ -72,12 +74,12 @@ const TaggsBar: React.FC<TaggsBarProps> = ({
               isIntegrated={INTEGRATED_SOCIAL_LIST.indexOf(social) !== -1}
               setTaggsNeedUpdate={setTaggsNeedUpdate}
               setSocialDataNeedUpdate={handleSocialUpdate}
-              screenType={screenType}
+              whiteRing={whiteRing ? whiteRing : undefined}
             />,
           );
           i++;
         }
-        if (!userXId && screenType !== ScreenType.SuggestedPeople) {
+        if (!userXId && !whiteRing) {
           for (let social of unlinkedSocials) {
             new_taggs.push(
               <Tagg
@@ -89,7 +91,7 @@ const TaggsBar: React.FC<TaggsBarProps> = ({
                 setSocialDataNeedUpdate={handleSocialUpdate}
                 userXId={userXId}
                 user={user}
-                screenType={screenType}
+                whiteRing={whiteRing ? whiteRing : undefined}
               />,
             );
             i++;
@@ -126,7 +128,7 @@ const TaggsBar: React.FC<TaggsBarProps> = ({
   return taggs.length > 0 ? (
     <View
       style={
-        screenType === ScreenType.SuggestedPeople
+        whiteRing
           ? [styles.spContainer]
           : [styles.container, {shadowOpacity, paddingTop}]
       }>