This commit is contained in:
marcosrdz 2021-02-24 20:56:06 -05:00
parent b8c04deec9
commit fb4557f4da
12 changed files with 38 additions and 19 deletions

2
App.js
View file

@ -302,7 +302,7 @@ const App = () => {
isVisible={isClipboardContentModalVisible} isVisible={isClipboardContentModalVisible}
onClose={hideClipboardContentModal} onClose={hideClipboardContentModal}
> >
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={[styles.modalContent, stylesHook.modalContent]}> <View style={[styles.modalContent, stylesHook.modalContent]}>
<BlueTextCentered> <BlueTextCentered>
{clipboardContentType === ClipboardContentType.BITCOIN && loc.wallets.clipboard_bitcoin} {clipboardContentType === ClipboardContentType.BITCOIN && loc.wallets.clipboard_bitcoin}

View file

@ -9,6 +9,7 @@ import {
StyleSheet, StyleSheet,
Text, Text,
TextInput, TextInput,
Platform,
TouchableOpacity, TouchableOpacity,
TouchableWithoutFeedback, TouchableWithoutFeedback,
View, View,
@ -360,7 +361,7 @@ const LNDCreateInvoice = () => {
<View style={[styles.root, styleHooks.root]}> <View style={[styles.root, styleHooks.root]}>
<StatusBar barStyle="light-content" /> <StatusBar barStyle="light-content" />
<View style={[styles.amount, styleHooks.amount]}> <View style={[styles.amount, styleHooks.amount]}>
<KeyboardAvoidingView behavior="position"> <KeyboardAvoidingView enabled={!Platform.isPad} behavior="position">
<BlueBitcoinAmount <BlueBitcoinAmount
isLoading={isLoading} isLoading={isLoading}
amount={amount} amount={amount}

View file

@ -313,7 +313,7 @@ const ReceiveDetails = () => {
const renderCustomAmountModal = () => { const renderCustomAmountModal = () => {
return ( return (
<BottomModal isVisible={isCustomModalVisible} onClose={dismissCustomAmountModal}> <BottomModal isVisible={isCustomModalVisible} onClose={dismissCustomAmountModal}>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={styles.modalContent}> <View style={styles.modalContent}>
<BlueBitcoinAmount <BlueBitcoinAmount
unit={customUnit} unit={customUnit}

View file

@ -115,7 +115,11 @@ const Broadcast = () => {
return ( return (
<SafeBlueArea style={styles.blueArea}> <SafeBlueArea style={styles.blueArea}>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null} keyboardShouldPersistTaps="handled"> <KeyboardAvoidingView
enabled={!Platform.isPad}
behavior={Platform.OS === 'ios' ? 'position' : null}
keyboardShouldPersistTaps="handled"
>
<View style={styles.wrapper}> <View style={styles.wrapper}>
{BROADCAST_RESULT.success !== broadcastResult && ( {BROADCAST_RESULT.success !== broadcastResult && (
<BlueCard style={styles.mainCard}> <BlueCard style={styles.mainCard}>

View file

@ -409,7 +409,7 @@ const CoinControl = () => {
setOutput(false); setOutput(false);
}} }}
> >
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={[styles.modalContent, { backgroundColor: colors.elevated }]}>{output && renderOutputModalContent()}</View> <View style={[styles.modalContent, { backgroundColor: colors.elevated }]}>{output && renderOutputModalContent()}</View>
</KeyboardAvoidingView> </KeyboardAvoidingView>
</BottomModal> </BottomModal>

View file

@ -78,7 +78,11 @@ const IsItMyAddress = () => {
return ( return (
<SafeBlueArea style={[styles.blueArea, stylesHooks.blueArea]}> <SafeBlueArea style={[styles.blueArea, stylesHooks.blueArea]}>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null} keyboardShouldPersistTaps="handled"> <KeyboardAvoidingView
enabled={!Platform.isPad}
behavior={Platform.OS === 'ios' ? 'position' : null}
keyboardShouldPersistTaps="handled"
>
<View style={styles.wrapper}> <View style={styles.wrapper}>
<BlueCard style={styles.mainCard}> <BlueCard style={styles.mainCard}>
<View style={[styles.input, stylesHooks.input]}> <View style={[styles.input, stylesHooks.input]}>

View file

@ -1,7 +1,17 @@
/* global alert */ /* global alert */
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { ActivityIndicator, View, TextInput, TouchableOpacity, Linking, ScrollView, StyleSheet, KeyboardAvoidingView } from 'react-native'; import {
ActivityIndicator,
Platform,
View,
TextInput,
TouchableOpacity,
Linking,
ScrollView,
StyleSheet,
KeyboardAvoidingView,
} from 'react-native';
import Clipboard from '@react-native-community/clipboard'; import Clipboard from '@react-native-community/clipboard';
import { Text } from 'react-native-elements'; import { Text } from 'react-native-elements';
import ReactNativeHapticFeedback from 'react-native-haptic-feedback'; import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
@ -158,7 +168,7 @@ export default class CPFP extends Component {
renderStage1(text) { renderStage1(text) {
return ( return (
<KeyboardAvoidingView behavior="position"> <KeyboardAvoidingView enabled={!Platform.isPad} behavior="position">
<SafeBlueArea style={styles.root}> <SafeBlueArea style={styles.root}>
<BlueSpacing /> <BlueSpacing />
<BlueCard style={styles.center}> <BlueCard style={styles.center}>

View file

@ -102,7 +102,7 @@ const WalletsAddMultisig = () => {
const renderModal = () => { const renderModal = () => {
return ( return (
<BottomModal isVisible={isModalVisible} onClose={closeModal}> <BottomModal isVisible={isModalVisible} onClose={closeModal}>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={[styles.modalContentShort, stylesHook.modalContentShort]}> <View style={[styles.modalContentShort, stylesHook.modalContentShort]}>
<Text style={[styles.textHeader, stylesHook.textHeader]}>{loc.multisig.quorum_header}</Text> <Text style={[styles.textHeader, stylesHook.textHeader]}>{loc.multisig.quorum_header}</Text>
<Text style={[styles.textSubtitle, stylesHook.textSubtitle]}>{loc.multisig.required_keys_out_of_total}</Text> <Text style={[styles.textSubtitle, stylesHook.textSubtitle]}>{loc.multisig.required_keys_out_of_total}</Text>

View file

@ -328,7 +328,7 @@ export default class HodlHodl extends Component {
renderChooseSideModal = () => { renderChooseSideModal = () => {
return ( return (
<BottomModal isVisible={this.state.isChooseSideModalVisible} onClose={this.hideChooseSideModal}> <BottomModal isVisible={this.state.isChooseSideModalVisible} onClose={this.hideChooseSideModal}>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={styles.modalContentShort}> <View style={styles.modalContentShort}>
<FlatList <FlatList
scrollEnabled={false} scrollEnabled={false}
@ -377,7 +377,7 @@ export default class HodlHodl extends Component {
} }
}} }}
> >
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={styles.modalContentShort}> <View style={styles.modalContentShort}>
<FlatList <FlatList
scrollEnabled={false} scrollEnabled={false}
@ -472,7 +472,7 @@ export default class HodlHodl extends Component {
return ( return (
<BottomModal isVisible={this.state.isChooseCountryModalVisible} onClose={this.hideChooseCountryModal}> <BottomModal isVisible={this.state.isChooseCountryModalVisible} onClose={this.hideChooseCountryModal}>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={styles.modalContent}> <View style={styles.modalContent}>
<View style={styles.searchInputContainer}> <View style={styles.searchInputContainer}>
<TextInput <TextInput
@ -546,7 +546,7 @@ export default class HodlHodl extends Component {
return ( return (
<BottomModal isVisible={this.state.isChooseCurrencyVisible} onClose={this.hideChooseCurrencyModal}> <BottomModal isVisible={this.state.isChooseCurrencyVisible} onClose={this.hideChooseCurrencyModal}>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={styles.modalContent}> <View style={styles.modalContent}>
<View style={styles.searchInputContainer}> <View style={styles.searchInputContainer}>
<TextInput <TextInput
@ -620,7 +620,7 @@ export default class HodlHodl extends Component {
return ( return (
<BottomModal isVisible={this.state.isChooseMethodVisible} deviceHeight={windowHeight} onClose={this.hideChooseMethodModal}> <BottomModal isVisible={this.state.isChooseMethodVisible} deviceHeight={windowHeight} onClose={this.hideChooseMethodModal}>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={styles.modalContent}> <View style={styles.modalContent}>
<View style={styles.searchInputContainer}> <View style={styles.searchInputContainer}>
<TextInput <TextInput

View file

@ -172,7 +172,7 @@ export default class HodlHodlMyContracts extends Component {
return ( return (
<BottomModal isVisible={this.state.isRenderContractVisible} onClose={this.hideContractModal}> <BottomModal isVisible={this.state.isRenderContractVisible} onClose={this.hideContractModal}>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={styles.modalContent}> <View style={styles.modalContent}>
<View style={styles.modalContentCentered}> <View style={styles.modalContentCentered}>
<Text style={styles.btcText}> <Text style={styles.btcText}>

View file

@ -272,7 +272,7 @@ const WalletTransactions = () => {
const renderManageFundsModal = () => { const renderManageFundsModal = () => {
return ( return (
<BottomModal isVisible={isManageFundsModalVisible} onClose={hideManageFundsModal}> <BottomModal isVisible={isManageFundsModalVisible} onClose={hideManageFundsModal}>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={[styles.advancedTransactionOptionsModalContent, stylesHook.advancedTransactionOptionsModalContent]}> <View style={[styles.advancedTransactionOptionsModalContent, stylesHook.advancedTransactionOptionsModalContent]}>
<BlueListItem <BlueListItem
hideChevron hideChevron

View file

@ -510,7 +510,7 @@ const ViewEditMultisigCosigners = () => {
const renderProvideMnemonicsModal = () => { const renderProvideMnemonicsModal = () => {
return ( return (
<BottomModal isVisible={isProvideMnemonicsModalVisible} onClose={hideProvideMnemonicsModal}> <BottomModal isVisible={isProvideMnemonicsModalVisible} onClose={hideProvideMnemonicsModal}>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={[styles.modalContent, stylesHook.modalContent]}> <View style={[styles.modalContent, stylesHook.modalContent]}>
<BlueTextCentered>{loc.multisig.type_your_mnemonics}</BlueTextCentered> <BlueTextCentered>{loc.multisig.type_your_mnemonics}</BlueTextCentered>
<BlueSpacing20 /> <BlueSpacing20 />
@ -535,7 +535,7 @@ const ViewEditMultisigCosigners = () => {
const renderShareModal = () => { const renderShareModal = () => {
return ( return (
<BottomModal isVisible={isShareModalVisible} onClose={hideShareModal}> <BottomModal isVisible={isShareModalVisible} onClose={hideShareModal}>
<KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}> <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
<View style={[styles.modalContent, stylesHook.modalContent, styles.alignItemsCenter]}> <View style={[styles.modalContent, stylesHook.modalContent, styles.alignItemsCenter]}>
<Text style={[styles.headerText, stylesHook.textDestination]}>{loc.multisig.this_is_cosigners_xpub}</Text> <Text style={[styles.headerText, stylesHook.textDestination]}>{loc.multisig.this_is_cosigners_xpub}</Text>
<View style={styles.qrCodeContainer}> <View style={styles.qrCodeContainer}>
@ -601,7 +601,7 @@ const ViewEditMultisigCosigners = () => {
<View style={[styles.root, stylesHook.root]}> <View style={[styles.root, stylesHook.root]}>
<StatusBar barStyle="light-content" /> <StatusBar barStyle="light-content" />
<KeyboardAvoidingView <KeyboardAvoidingView
enabled enabled={!Platform.isPad}
behavior={Platform.OS === 'ios' ? 'padding' : null} behavior={Platform.OS === 'ios' ? 'padding' : null}
keyboardVerticalOffset={62} keyboardVerticalOffset={62}
style={[styles.mainBlock, styles.root]} style={[styles.mainBlock, styles.root]}