Skip to content

Commit d7a52ce

Browse files
juanky201271juanky201271
committed
fix: ison send close all modals fix
1 parent 1a542f4 commit d7a52ce

File tree

9 files changed

+38
-45
lines changed

9 files changed

+38
-45
lines changed

‎components/AddressBook/AddressBook.tsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ const AddressBook: React.FunctionComponent<AddressBookProps> = ({ setAddressBook
224224
item={aBItem}
225225
setCurrentItem={setCurrentItem}
226226
setAction={setAction}
227-
closeModal={hide}
228227
handleScrollToTop={handleScrollToTop}
229228
doAction={doAction}
230229
/>
@@ -243,7 +242,6 @@ const AddressBook: React.FunctionComponent<AddressBookProps> = ({ setAddressBook
243242
item={aBItem}
244243
setCurrentItem={setCurrentItem}
245244
setAction={setAction}
246-
closeModal={hide}
247245
handleScrollToTop={handleScrollToTop}
248246
doAction={doAction}
249247
/>
@@ -261,7 +259,6 @@ const AddressBook: React.FunctionComponent<AddressBookProps> = ({ setAddressBook
261259
item={aBItem}
262260
setCurrentItem={setCurrentItem}
263261
setAction={setAction}
264-
closeModal={hide}
265262
handleScrollToTop={handleScrollToTop}
266263
doAction={doAction}
267264
addressProtected={true}

‎components/AddressBook/components/AbSummaryLine.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ type AbSummaryLineProps = {
2828
item: AddressBookFileClass;
2929
setCurrentItem: (b: number) => void;
3030
setAction: (action: AddressBookActionEnum) => void;
31-
closeModal: () => void;
3231
handleScrollToTop: () => void;
3332
doAction: (
3433
action: AddressBookActionEnum,
@@ -44,13 +43,12 @@ const AbSummaryLine: React.FunctionComponent<AbSummaryLineProps> = ({
4443
item,
4544
setCurrentItem,
4645
setAction,
47-
closeModal,
4846
handleScrollToTop,
4947
doAction,
5048
addressProtected,
5149
}) => {
5250
const context = useContext(ContextAppLoaded);
53-
const { translate, navigation, readOnly, mode, totalBalance, language, selectServer, setSendPageState } = context;
51+
const { translate, navigation, readOnly, mode, totalBalance, language, selectServer, setSendPageState, closeAllModals } = context;
5452
const { colors } = useTheme() as ThemeType;
5553
moment.locale(language);
5654

@@ -161,7 +159,7 @@ const AbSummaryLine: React.FunctionComponent<AbSummaryLineProps> = ({
161159
const sendPageState = new SendPageStateClass(new ToAddrClass(0));
162160
sendPageState.toaddr.to = item.address;
163161
setSendPageState(sendPageState);
164-
closeModal();
162+
closeAllModals();
165163
navigation.navigate(RouteEnums.LoadedApp, {
166164
screen: translate('loadedapp.send-menu'),
167165
initial: false,

‎components/Components/AddressItem.tsx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import 'moment/locale/ru';
2525

2626
type AddressItemProps = {
2727
address: string;
28-
closeModal?: () => void;
2928
oneLine?: boolean;
3029
onlyContact?: boolean;
3130
withIcon?: boolean;
@@ -39,7 +38,6 @@ const AddressItem: React.FunctionComponent<AddressItemProps> = ({
3938
onlyContact,
4039
withIcon,
4140
withSendIcon,
42-
closeModal,
4341
addressProtected,
4442
}) => {
4543
const context = useContext(ContextAppLoaded);
@@ -56,6 +54,7 @@ const AddressItem: React.FunctionComponent<AddressItemProps> = ({
5654
language,
5755
selectServer,
5856
setSendPageState,
57+
closeAllModals,
5958
} = context;
6059
const { colors } = useTheme() as ThemeType;
6160
moment.locale(language);
@@ -190,9 +189,7 @@ const AddressItem: React.FunctionComponent<AddressItemProps> = ({
190189
const sendPageState = new SendPageStateClass(new ToAddrClass(0));
191190
sendPageState.toaddr.to = address;
192191
setSendPageState(sendPageState);
193-
if (closeModal) {
194-
closeModal();
195-
}
192+
closeAllModals();
196193
navigation.navigate(RouteEnums.LoadedApp, {
197194
screen: translate('loadedapp.send-menu'),
198195
initial: false,

‎components/History/components/ValueTransferDetail.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,6 @@ const ValueTransferDetail: React.FunctionComponent<ValueTransferDetailProps> = (
362362
address={valueTransfer.address}
363363
withIcon={true}
364364
withSendIcon={true}
365-
closeModal={hide}
366365
addressProtected={addressProtected}
367366
/>
368367
</View>

‎components/History/components/ValueTransferLine.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ const ValueTransferLine: React.FunctionComponent<ValueTransferLineProps> = ({
6767
readOnly,
6868
selectServer,
6969
setSendPageState,
70+
closeAllModals,
7071
} = context;
7172
const { colors } = useTheme() as ThemeType;
7273
moment.locale(language);
@@ -216,6 +217,7 @@ const ValueTransferLine: React.FunctionComponent<ValueTransferLineProps> = ({
216217
const sendPageState = new SendPageStateClass(new ToAddrClass(0));
217218
sendPageState.toaddr.to = vt.address ? vt.address : '';
218219
setSendPageState(sendPageState);
220+
closeAllModals();
219221
navigation.navigate(RouteEnums.LoadedApp, {
220222
screen: translate('loadedapp.send-menu'),
221223
initial: false,

‎components/Messages/components/ContactLine.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const ContactLine: React.FunctionComponent<ContactLineProps> = ({
5050
addressProtected,
5151
}) => {
5252
const context = useContext(ContextAppLoaded);
53-
const { translate, language, navigation, showSwipeableIcons, readOnly, selectServer, setSendPageState } = context;
53+
const { translate, language, navigation, showSwipeableIcons, readOnly, selectServer, setSendPageState, closeAllModals } = context;
5454
const { colors } = useTheme() as ThemeType;
5555
moment.locale(language);
5656

@@ -197,6 +197,7 @@ const ContactLine: React.FunctionComponent<ContactLineProps> = ({
197197
const sendPageState = new SendPageStateClass(new ToAddrClass(0));
198198
sendPageState.toaddr.to = c.address ? c.address : '';
199199
setSendPageState(sendPageState);
200+
closeAllModals();
200201
navigation.navigate(RouteEnums.LoadedApp, {
201202
screen: translate('loadedapp.send-menu'),
202203
initial: false,

‎components/Seed/Seed.tsx‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ const Seed: React.FunctionComponent<SeedProps> = ({
8888
}
8989

9090
const { colors } = useTheme() as ThemeType;
91+
// when this screen is open from LoadingApp (new wallet)
92+
// is using the standard modal from react-native
9193
const { hide } = useMagicModal();
9294
moment.locale(language);
9395

@@ -177,12 +179,20 @@ const Seed: React.FunctionComponent<SeedProps> = ({
177179

178180
const onClickCancelHide = () => {
179181
onClickCancel();
180-
hide();
182+
// when this screen is open from LoadingApp (new wallet)
183+
// is using the standard modal from react-native
184+
if (action !== SeedActionEnum.new) {
185+
hide();
186+
}
181187
};
182188

183189
const onClickOKHide = (seedPhraseParm: string, birthdayNumberParm: number) => {
184190
onClickOK(seedPhraseParm, birthdayNumberParm);
185-
hide();
191+
// when this screen is open from LoadingApp (new wallet)
192+
// is using the standard modal from react-native
193+
if (action !== SeedActionEnum.new) {
194+
hide();
195+
}
186196
};
187197

188198
//console.log('=================================');

‎components/Ufvk/ImportUfvk.tsx‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
TextInput,
88
KeyboardAvoidingView,
99
Platform,
10+
Modal,
1011
} from 'react-native';
1112
import { SafeAreaProvider, SafeAreaView } from 'react-native-safe-area-context';
1213

@@ -26,7 +27,6 @@ import 'moment/locale/es';
2627
import 'moment/locale/pt';
2728
import 'moment/locale/ru';
2829
import { ButtonTypeEnum, GlobalConst, SelectServerEnum } from '../../app/AppState';
29-
import { magicModal, useMagicModal } from 'react-native-magic-modal';
3030

3131
type ImportUfvkProps = {
3232
onClickCancel: () => void;
@@ -36,11 +36,11 @@ const ImportUfvk: React.FunctionComponent<ImportUfvkProps> = ({ onClickCancel, o
3636
const context = useContext(ContextAppLoading);
3737
const { translate, netInfo, info, server, mode, addLastSnackbar, language, selectServer } = context;
3838
const { colors } = useTheme() as ThemeType;
39-
const { hide } = useMagicModal();
4039
moment.locale(language);
4140

4241
const [seedufvkText, setSeedufvkText] = useState<string>('');
4342
const [birthday, setBirthday] = useState<string>('');
43+
const [qrcodeModalVisible, setQrcodeModalVisible] = useState<boolean>(false);
4444
const [latestBlock, setLatestBlock] = useState<number>(0);
4545

4646
useEffect(() => {
@@ -105,24 +105,7 @@ const ImportUfvk: React.FunctionComponent<ImportUfvkProps> = ({ onClickCancel, o
105105
addLastSnackbar({ message: translate('loadedapp.connection-error') as string });
106106
return;
107107
}
108-
onClickOKAndHide(seedufvkText.trimEnd().trimStart(), Number(birthday));
109-
};
110-
111-
const setQrcodeModalShow = () => {
112-
return magicModal.show(() => <ScannerUfvk
113-
setUfvkText={setSeedufvkText}
114-
/>, { swipeDirection: undefined }
115-
).promise;
116-
};
117-
118-
const onClickCancelAndHide = () => {
119-
onClickCancel();
120-
hide();
121-
};
122-
123-
const onClickOKAndHide = (keyTextParm: string, birthdayParm: number) => {
124-
onClickOK(keyTextParm, birthdayParm);
125-
hide();
108+
onClickOK(seedufvkText.trimEnd().trimStart(), Number(birthday));
126109
};
127110

128111
return (
@@ -139,6 +122,13 @@ const ImportUfvk: React.FunctionComponent<ImportUfvkProps> = ({ onClickCancel, o
139122
height: '100%',
140123
backgroundColor: colors.background,
141124
}}>
125+
<Modal
126+
animationType="slide"
127+
transparent={false}
128+
visible={qrcodeModalVisible}
129+
onRequestClose={() => setQrcodeModalVisible(false)}>
130+
<ScannerUfvk setUfvkText={setSeedufvkText} closeModal={() => setQrcodeModalVisible(false)} />
131+
</Modal>
142132
<Header
143133
title={translate('import.title') as string}
144134
noBalance={true}
@@ -148,7 +138,7 @@ const ImportUfvk: React.FunctionComponent<ImportUfvkProps> = ({ onClickCancel, o
148138
translate={translate}
149139
netInfo={netInfo}
150140
mode={mode}
151-
closeScreen={onClickCancelAndHide}
141+
closeScreen={onClickCancel}
152142
/>
153143
<ScrollView
154144
keyboardShouldPersistTaps="handled"
@@ -210,7 +200,7 @@ const ImportUfvk: React.FunctionComponent<ImportUfvkProps> = ({ onClickCancel, o
210200
)}
211201
<TouchableOpacity
212202
onPress={() => {
213-
setQrcodeModalShow();
203+
setQrcodeModalVisible(true);
214204
}}>
215205
<FontAwesomeIcon size={35} icon={faQrcode} color={colors.border} />
216206
</TouchableOpacity>

‎components/Ufvk/components/ScannerUfvk.tsx‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@ import { SafeAreaProvider, SafeAreaView } from 'react-native-safe-area-context';
1212
import { useTheme } from '@react-navigation/native';
1313
import { ThemeType } from '../../../app/types';
1414
import { Code } from 'react-native-vision-camera';
15-
import { useMagicModal } from 'react-native-magic-modal';
1615

17-
type ScannerKeyProps = {
16+
type ScannerUfvkProps = {
1817
setUfvkText: (k: string) => void;
18+
closeModal: () => void;
1919
};
20-
const ScannerKey: React.FunctionComponent<ScannerKeyProps> = ({ setUfvkText }) => {
20+
const ScannerUfvk: React.FunctionComponent<ScannerUfvkProps> = ({ setUfvkText, closeModal }) => {
2121
const context = useContext(ContextAppLoading);
2222
const { translate, language } = context;
2323
const { colors } = useTheme() as ThemeType;
24-
const { hide } = useMagicModal();
2524
moment.locale(language);
2625

2726
const onRead = async (codes: Code[]) => {
@@ -32,7 +31,7 @@ const ScannerKey: React.FunctionComponent<ScannerKeyProps> = ({ setUfvkText }) =
3231
}
3332

3433
setUfvkText(scandata);
35-
hide();
34+
closeModal();
3635
};
3736

3837
return (
@@ -51,12 +50,12 @@ const ScannerKey: React.FunctionComponent<ScannerKeyProps> = ({ setUfvkText }) =
5150
noSyncingStatus={true}
5251
noDrawMenu={true}
5352
noPrivacy={true}
54-
closeScreen={hide}
53+
closeScreen={closeModal}
5554
/>
5655
<Scanner onRead={onRead} />
5756
</SafeAreaView>
5857
</SafeAreaProvider>
5958
);
6059
};
6160

62-
export default ScannerKey;
61+
export default ScannerUfvk;

0 commit comments

Comments
 (0)