diff --git a/apps/mobile/src/components/Loading/index.js b/apps/mobile/src/components/Loading/index.js index d3602fb5c..18e674489 100644 --- a/apps/mobile/src/components/Loading/index.js +++ b/apps/mobile/src/components/Loading/index.js @@ -10,12 +10,13 @@ export const Loading = ({ done = false, doneText = 'Action completed successfully!', onDone = () => {}, + customStyle ={} }) => { const [state, dispatch] = useTracked(); const {colors, tags, premiumUser} = state; return ( - + {done ? ( <> { const [state, dispatch] = useTracked(); @@ -172,7 +173,7 @@ const LoginDialog = () => { }; const signupUser = async () => { - if (!validateInfo) return; + if (!validateInfo()) return; setSigningIn(true); setStatus('Creating your account'); @@ -220,6 +221,7 @@ const LoginDialog = () => { alignSelf: 'center', justifyContent: 'center', alignItems: 'center', + overflow:"hidden" }}> {DDS.isTab ? ( { ) : null} {loggingIn || signingIn ? ( - modalVisible ? ( - + + + ) : null} + + {modalVisible ? ( + + + Data Recovery Key + + + We cannot recover your data if you forget your password. You can + use this recovery key to get your data back if you lose your + password. + + + + Take a Sceenshot of this screen + + + { + Clipboard.setString(key); + ToastEvent.show('Recovery key copied!', 'success', 'local'); + }} + style={{ + flexDirection: 'row', + borderWidth: 1, + borderRadius: 5, + paddingVertical: 8, + paddingHorizontal: 10, + marginTop: 15, alignItems: 'center', + borderColor: colors.nav, }}> - Data Recovery Key - - - We cannot recover your data if you forget your password. You - can use this recovery key to get your data back if you lose - your password. - - - - Take a Sceenshot of this screen - - - { - Clipboard.setString(key); - ToastEvent.show('Recovery key copied!', 'success', 'local'); - }} - style={{ - flexDirection: 'row', - borderWidth: 1, - borderRadius: 5, - paddingVertical: 8, - paddingHorizontal: 10, - marginTop: 15, - alignItems: 'center', - borderColor: colors.nav, - }}> - - {key} - - - - - You can get recovery key in settings on any device later. + {key} - { - close(); - }} - activeOpacity={opacity} + + + + You can get recovery key in settings on any device later. + + { + close(); + }} + activeOpacity={opacity} + style={{ + ...getElevation(5), + paddingVertical: pv + 5, + paddingHorizontal: ph, + borderRadius: 5, + width: '90%', + marginTop: 20, + justifyContent: 'center', + alignItems: 'center', + backgroundColor: colors.accent, + }}> + - - I have saved the key - - - - ) : ( - - ) + I have saved the key + + + ) : ( <> {DDS.isTab ? null : ( @@ -381,8 +402,8 @@ const LoginDialog = () => { position: 'absolute', top: 0, marginBottom: 15, - zIndex:10, - left:0 + zIndex: 10, + left: 0, }} color={colors.heading} /> @@ -797,7 +818,6 @@ const LoginDialog = () => { style={{ flexDirection: 'row', width: '100%', - alignItems: 'center', }}> { @@ -809,10 +829,11 @@ const LoginDialog = () => { /> By signing up you agree to our{' '} { { - ToastEvent.show('hello world', 'error', 'local'); - setLogin(!login); }} activeOpacity={opacity} diff --git a/apps/mobile/src/components/SimpleList/index.js b/apps/mobile/src/components/SimpleList/index.js index 709a337ba..0cff68b9b 100644 --- a/apps/mobile/src/components/SimpleList/index.js +++ b/apps/mobile/src/components/SimpleList/index.js @@ -199,8 +199,8 @@ const SimpleList = ({ ? 130 : 130 - 60 : listData[0] && !selectionMode - ? 150 - initialWindowMetrics.insets.top - : (150 - initialWindowMetrics.insets.top) - 60, + ? 155 - initialWindowMetrics.insets.top + : (155 - initialWindowMetrics.insets.top) - 60, }; }, [selectionMode, listData, colors]);