aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/components/suggestedPeople/index.ts1
-rw-r--r--src/components/suggestedPeople/legacy/SPTaggsBar.tsx (renamed from src/components/suggestedPeople/SPTaggsBar.tsx)14
-rw-r--r--src/components/taggs/Tagg.tsx56
-rw-r--r--src/components/taggs/TaggsBar.tsx2
4 files changed, 12 insertions, 61 deletions
diff --git a/src/components/suggestedPeople/index.ts b/src/components/suggestedPeople/index.ts
index 34bb96d4..ecdf4f35 100644
--- a/src/components/suggestedPeople/index.ts
+++ b/src/components/suggestedPeople/index.ts
@@ -1,3 +1,2 @@
export {default as MutualFriends} from './MutualFriends';
-export {default as SPTaggsBar} from './SPTaggsBar';
export {default as BadgeIcon} from './BadgeIcon';
diff --git a/src/components/suggestedPeople/SPTaggsBar.tsx b/src/components/suggestedPeople/legacy/SPTaggsBar.tsx
index 3ab33da1..3273f88d 100644
--- a/src/components/suggestedPeople/SPTaggsBar.tsx
+++ b/src/components/suggestedPeople/legacy/SPTaggsBar.tsx
@@ -2,12 +2,12 @@ import React, {useEffect, useState} from 'react';
import {StyleSheet} from 'react-native';
import Animated from 'react-native-reanimated';
import {useDispatch, useSelector} from 'react-redux';
-import {INTEGRATED_SOCIAL_LIST, SOCIAL_LIST} from '../../constants';
-import {getLinkedSocials} from '../../services';
-import {loadIndividualSocial, updateSocial} from '../../store/actions';
-import {RootState} from '../../store/rootReducer';
-import {ScreenType} from '../../types';
-import Tagg from '../taggs/Tagg';
+import {INTEGRATED_SOCIAL_LIST, SOCIAL_LIST} from '../../../constants';
+import {getLinkedSocials} from '../../../services';
+import {loadIndividualSocial, updateSocial} from '../../../store/actions';
+import {RootState} from '../../../store/rootReducer';
+import {ScreenType} from '../../../types';
+import Tagg from '../../taggs/Tagg';
const {View, ScrollView} = Animated;
interface TaggsBarProps {
@@ -66,7 +66,6 @@ const TaggsBar: React.FC<TaggsBarProps> = ({
isIntegrated={INTEGRATED_SOCIAL_LIST.indexOf(social) !== -1}
setTaggsNeedUpdate={setTaggsNeedUpdate}
setSocialDataNeedUpdate={handleSocialUpdate}
- whiteRing={true}
screenType={screenType}
/>,
);
@@ -84,7 +83,6 @@ const TaggsBar: React.FC<TaggsBarProps> = ({
setSocialDataNeedUpdate={handleSocialUpdate}
userXId={userXId}
user={user}
- whiteRing={true}
screenType={screenType}
/>,
);
diff --git a/src/components/taggs/Tagg.tsx b/src/components/taggs/Tagg.tsx
index 4a58bacb..0e0311c5 100644
--- a/src/components/taggs/Tagg.tsx
+++ b/src/components/taggs/Tagg.tsx
@@ -5,13 +5,8 @@ import {useSelector} from 'react-redux';
import PurpleRingPlus from '../../assets/icons/purple_ring+.svg';
import PurpleRing from '../../assets/icons/purple_ring.svg';
import RingPlus from '../../assets/icons/ring+.svg';
-import WhiteRing from '../../assets/icons/ring-white.svg';
import Ring from '../../assets/icons/ring.svg';
-import {
- INTEGRATED_SOCIAL_LIST,
- SOCIAL_ICON_SIZE_ADJUSTMENT,
- TAGG_RING_DIM,
-} from '../../constants';
+import {INTEGRATED_SOCIAL_LIST, TAGG_RING_DIM} from '../../constants';
import {
ERROR_LINK,
ERROR_UNABLE_TO_FIND_PROFILE,
@@ -24,8 +19,8 @@ import {
} from '../../services';
import {RootState} from '../../store/rootReducer';
import {ScreenType, UserType} from '../../types';
-import {canViewProfile, normalize} from '../../utils';
-import {SmallSocialIcon, SocialIcon, SocialLinkModal} from '../common';
+import {canViewProfile} from '../../utils';
+import {SocialIcon, SocialLinkModal} from '../common';
interface TaggProps {
social: string;
@@ -35,7 +30,6 @@ interface TaggProps {
setSocialDataNeedUpdate: (social: string, username: string) => void;
userXId: string | undefined;
user: UserType;
- whiteRing: boolean | undefined;
screenType: ScreenType;
}
@@ -48,7 +42,6 @@ const Tagg: React.FC<TaggProps> = ({
userXId,
screenType,
user,
- whiteRing,
}) => {
const navigation = useNavigation();
const state = useSelector((s: RootState) => s);
@@ -107,9 +100,6 @@ const Tagg: React.FC<TaggProps> = ({
const pickTheRightRingHere = () => {
if (youMayPass) {
- if (whiteRing) {
- return <WhiteRing width={TAGG_RING_DIM} height={TAGG_RING_DIM} />;
- }
if (social === 'Tagg') {
return <Ring width={TAGG_RING_DIM} height={TAGG_RING_DIM} />;
} else {
@@ -139,7 +129,7 @@ const Tagg: React.FC<TaggProps> = ({
return (
<>
- {(userXId && !isLinked) || (whiteRing && !userXId) ? (
+ {userXId && !isLinked ? (
<Fragment />
) : (
<>
@@ -149,27 +139,13 @@ const Tagg: React.FC<TaggProps> = ({
setModalVisible={setModalVisible}
completionCallback={linkNonIntegratedSocial}
/>
- <View style={whiteRing ? styles.spcontainer : styles.container}>
+ <View style={styles.container}>
<TouchableOpacity
style={styles.iconTap}
onPress={modalOrAuthBrowserOrPass}>
<SocialIcon style={styles.icon} social={social} whiteRing />
{pickTheRightRingHere()}
</TouchableOpacity>
- {!whiteRing && (
- <View style={styles.smallIconContainer}>
- <SmallSocialIcon
- style={[
- styles.smallIcon,
- {
- height: SOCIAL_ICON_SIZE_ADJUSTMENT[social],
- width: SOCIAL_ICON_SIZE_ADJUSTMENT[social],
- },
- ]}
- social={social}
- />
- </View>
- )}
</View>
</>
)}
@@ -178,19 +154,10 @@ const Tagg: React.FC<TaggProps> = ({
};
const styles = StyleSheet.create({
- spcontainer: {
- justifyContent: 'space-between',
- alignItems: 'center',
- marginRight: 15,
- marginLeft: 19,
- height: normalize(60),
- },
container: {
justifyContent: 'space-between',
alignItems: 'center',
- marginRight: 15,
- marginLeft: 15,
- height: normalize(90),
+ marginHorizontal: 15,
},
iconTap: {
justifyContent: 'center',
@@ -202,17 +169,6 @@ const styles = StyleSheet.create({
borderRadius: 30,
position: 'absolute',
},
- smallIconContainer: {
- height: 20,
- width: 20,
- position: 'absolute',
- justifyContent: 'center',
- alignItems: 'center',
- bottom: 0,
- },
- smallIcon: {
- borderRadius: 1000,
- },
});
export default Tagg;
diff --git a/src/components/taggs/TaggsBar.tsx b/src/components/taggs/TaggsBar.tsx
index a7e8fc7a..7076ffaf 100644
--- a/src/components/taggs/TaggsBar.tsx
+++ b/src/components/taggs/TaggsBar.tsx
@@ -82,7 +82,6 @@ const TaggsBar: React.FC<TaggsBarProps> = ({
isIntegrated={INTEGRATED_SOCIAL_LIST.indexOf(social) !== -1}
setTaggsNeedUpdate={setTaggsNeedUpdate}
setSocialDataNeedUpdate={handleSocialUpdate}
- whiteRing={false}
/>,
);
i++;
@@ -100,7 +99,6 @@ const TaggsBar: React.FC<TaggsBarProps> = ({
userXId={userXId}
screenType={screenType}
user={user}
- whiteRing={false}
/>,
);
i++;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-06 23:05:37 +0000