Merge branch 'master' into tma-634-badge-selection-screen

# Conflicts:
#	src/components/taggs/SocialMediaInfo.tsx

1 files changed, 1 insertions, 1 deletions

diff --git a/src/components/profile/Friends.tsx b/src/components/profile/Friends.tsx
index 02a7460a..7c7265c5 100644
--- a/src/components/profile/Friends.tsx
+++ b/src/components/profile/Friends.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import {View, StyleSheet, ScrollView, Text} from 'react-native';
 import {ProfilePreviewType, ScreenType} from '../../types';
-import {ProfilePreview} from '..';
+import {ProfilePreview} from '../profile';
 import {normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
 import {TAGG_LIGHT_BLUE} from '../../constants';
 import {RootState} from '../../store/rootReducer';