diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-02-20 12:08:59 -0500 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-02-20 12:08:59 -0500 |
| commit | 8357cea9e510c97ba8816cb6850541509c5d764e (patch) | |
| tree | 2078369aa878324088e62b998de76e0a5e487819 /src/components/taggs/TaggsBar.tsx | |
| parent | d671ce2a0dfc9d2ca181b5a21769c0cbd3be2fd3 (diff) | |
| parent | f4d8c3058ac601b0652f28e4ac5e3a6360b7bbd7 (diff) | |
Merge branch 'master' into tma644-edit-suggested
Diffstat (limited to 'src/components/taggs/TaggsBar.tsx')
| -rw-r--r-- | src/components/taggs/TaggsBar.tsx | 10 |
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}] }> |
