|
@@ -2,6 +2,7 @@ import { useNavigation } from '@react-navigation/native';
|
2
|
2
|
import React, { useCallback, useLayoutEffect, useState } from 'react';
|
3
|
3
|
import { useTranslation } from 'react-i18next';
|
4
|
4
|
import { ScrollView, Text, View, ViewStyle } from 'react-native';
|
|
5
|
+import { Edge } from 'react-native-safe-area-context';
|
5
|
6
|
import { useDispatch, useSelector } from 'react-redux';
|
6
|
7
|
|
7
|
8
|
import { IReduxState } from '../../../app/types';
|
|
@@ -39,6 +40,7 @@ const ProfileView = ({ isInWelcomePage }: {
|
39
|
40
|
(state: IReduxState) => state['features/base/settings']
|
40
|
41
|
);
|
41
|
42
|
const participant = useSelector((state: IReduxState) => getLocalParticipant(state));
|
|
43
|
+ const { locationURL } = useSelector((state: IReduxState) => state['features/base/connection']);
|
42
|
44
|
|
43
|
45
|
const [ displayName, setDisplayName ] = useState(reduxDisplayName);
|
44
|
46
|
const [ email, setEmail ] = useState(reduxEmail);
|
|
@@ -103,7 +105,9 @@ const ProfileView = ({ isInWelcomePage }: {
|
103
|
105
|
useLayoutEffect(() => {
|
104
|
106
|
navigation.setOptions({
|
105
|
107
|
headerLeft,
|
106
|
|
- headerRight: !isInWelcomePage && headerRight
|
|
108
|
+ headerRight: !isInWelcomePage
|
|
109
|
+ && !locationURL?.hostname?.includes('8x8.vc')
|
|
110
|
+ && headerRight
|
107
|
111
|
});
|
108
|
112
|
}, [ navigation ]);
|
109
|
113
|
|
|
@@ -112,7 +116,7 @@ const ProfileView = ({ isInWelcomePage }: {
|
112
|
116
|
disableForcedKeyboardDismiss = { true }
|
113
|
117
|
|
114
|
118
|
// @ts-ignore
|
115
|
|
- safeAreaInsets = { [ !isInWelcomePage && 'bottom', 'left', 'right' ].filter(Boolean) }
|
|
119
|
+ safeAreaInsets = { [ !isInWelcomePage && 'bottom', 'left', 'right' ].filter(Boolean) as Edge[] }
|
116
|
120
|
style = { styles.settingsViewContainer }>
|
117
|
121
|
<ScrollView
|
118
|
122
|
bounces = { isInWelcomePage }
|