diff --git a/src/screens/settings/SettingsBackupScreen/Components/GoogleDriveModal.tsx b/src/screens/settings/SettingsBackupScreen/Components/GoogleDriveModal.tsx index a98a6d0c..1bcefb8e 100644 --- a/src/screens/settings/SettingsBackupScreen/Components/GoogleDriveModal.tsx +++ b/src/screens/settings/SettingsBackupScreen/Components/GoogleDriveModal.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import { ThemeColors } from '@theme/types'; import { StyleSheet, Text, View, Image } from 'react-native'; -import { TextInput } from 'react-native-paper'; +import { Portal, TextInput } from 'react-native-paper'; import { GoogleSignin, User } from '@react-native-google-signin/google-signin'; import { Button, EmptyView, Modal } from '@components'; import { FlatList, TouchableOpacity } from 'react-native-gesture-handler'; @@ -276,38 +276,40 @@ export default function GoogleDriveModal({ }; return ( - - <> - - - {getString('backupScreen.drive.googleDriveBackup')} - - { - if (user?.user.email) { - Clipboard.setStringAsync(user.user.email).then(success => { - if (success) { - showToast( - getString('common.copiedToClipboard', { - name: user.user.email, - }), - ); - } - }); - } - }} - > - {user ? ( - - ) : null} - - - {renderModal()} - - + + + <> + + + {getString('backupScreen.drive.googleDriveBackup')} + + { + if (user?.user.email) { + Clipboard.setStringAsync(user.user.email).then(success => { + if (success) { + showToast( + getString('common.copiedToClipboard', { + name: user.user.email, + }), + ); + } + }); + } + }} + > + {user ? ( + + ) : null} + + + {renderModal()} + + + ); } diff --git a/src/screens/settings/SettingsBackupScreen/Components/SelfHostModal.tsx b/src/screens/settings/SettingsBackupScreen/Components/SelfHostModal.tsx index 29c414e4..b402a697 100644 --- a/src/screens/settings/SettingsBackupScreen/Components/SelfHostModal.tsx +++ b/src/screens/settings/SettingsBackupScreen/Components/SelfHostModal.tsx @@ -8,7 +8,7 @@ import { fetchTimeout } from '@utils/fetch/fetch'; import React, { useEffect, useState } from 'react'; import { StyleSheet, Text, View } from 'react-native'; import { FlatList } from 'react-native-gesture-handler'; -import { TextInput } from 'react-native-paper'; +import { Portal, TextInput } from 'react-native-paper'; enum BackupModal { SET_HOST, @@ -265,16 +265,18 @@ export default function SelfHostModal({ }; return ( - - <> - - - {getString('backupScreen.remote.backup')} - - - {renderModal()} - - + + + <> + + + {getString('backupScreen.remote.backup')} + + + {renderModal()} + + + ); } diff --git a/src/screens/settings/SettingsBackupScreen/index.tsx b/src/screens/settings/SettingsBackupScreen/index.tsx index 6b2c32f4..ccd9c7f1 100644 --- a/src/screens/settings/SettingsBackupScreen/index.tsx +++ b/src/screens/settings/SettingsBackupScreen/index.tsx @@ -1,7 +1,6 @@ import React from 'react'; import { useTheme } from '@hooks/persisted'; import { Appbar, List, SafeAreaView } from '@components'; -import { Portal } from 'react-native-paper'; import { useBoolean } from '@hooks'; import { BackupSettingsScreenProps } from '@navigators/types'; import GoogleDriveModal from './Components/GoogleDriveModal'; @@ -81,18 +80,16 @@ const BackupSettings = ({ navigation }: BackupSettingsScreenProps) => { /> - - - - + + ); };