diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-07-23 18:53:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 18:53:15 -0400 |
| commit | 88b8d6c732d871ddf48bb6a4a1bb8cfb27f0bc1d (patch) | |
| tree | 0e36f5b9258a2104d35bb929546575df4b0bfd22 /src/components/profile | |
| parent | 14c151ba80672938fecd4768b30f5812bd0a996e (diff) | |
| parent | e39fcbd9e35f6a5e36afe248e24bea0dd3859202 (diff) | |
Merge branch 'master' into tma985-moment-view-count
Diffstat (limited to 'src/components/profile')
| -rw-r--r-- | src/components/profile/Content.tsx | 2 | ||||
| -rw-r--r-- | src/components/profile/ProfileBadges.tsx | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/components/profile/Content.tsx b/src/components/profile/Content.tsx index 2d1002dd..9edd890d 100644 --- a/src/components/profile/Content.tsx +++ b/src/components/profile/Content.tsx @@ -6,6 +6,7 @@ import Animated, { useSharedValue, } from 'react-native-reanimated'; import {useDispatch, useSelector, useStore} from 'react-redux'; +import {MomentUploadProgressBar} from '..'; import { blockUnblockUser, loadFriendsData, @@ -140,6 +141,7 @@ const Content: React.FC<ContentProps> = ({userXId, screenType}) => { refreshControl={ <RefreshControl refreshing={refreshing} onRefresh={onRefresh} /> }> + {!userXId && <MomentUploadProgressBar />} <Cover {...{userXId, screenType}} /> <ProfileCutout /> <ProfileHeader diff --git a/src/components/profile/ProfileBadges.tsx b/src/components/profile/ProfileBadges.tsx index 8e68dc46..c7d3b5ba 100644 --- a/src/components/profile/ProfileBadges.tsx +++ b/src/components/profile/ProfileBadges.tsx @@ -64,8 +64,8 @@ const ProfileBadges: React.FC<ProfileBadgesProps> = ({userXId, screenType}) => { <PlusIcon /> {Array(BADGE_LIMIT) .fill(0) - .map(() => ( - <View style={[styles.grey, styles.circle]} /> + .map((_item, index) => ( + <View key={index} style={[styles.grey, styles.circle]} /> ))} </ScrollView> )} @@ -85,8 +85,8 @@ const ProfileBadges: React.FC<ProfileBadgesProps> = ({userXId, screenType}) => { {Array(BADGE_LIMIT + 1) .fill(0) .splice(displayBadges.length + 1, BADGE_LIMIT) - .map(() => ( - <View style={styles.circle} /> + .map((_item, index) => ( + <View key={index} style={styles.circle} /> ))} {/* X button */} {displayBadges.length === BADGE_LIMIT && isOwnProfile && ( |