From 5654a4874a43a3b9bfb15b20bee6e747ae536dce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Rodriguez=20V=C3=A9lez?= <marcospr@pm.me>
Date: Tue, 16 Nov 2021 11:40:01 -0500
Subject: [PATCH] FIX: Can't adjust multisig setting on 4" iPhone #4206

---
 components/BottomModal.js     |  4 ++--
 screen/wallets/addMultisig.js | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/components/BottomModal.js b/components/BottomModal.js
index 82370f089..40a42979e 100644
--- a/components/BottomModal.js
+++ b/components/BottomModal.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { StyleSheet, Platform, useWindowDimensions, View } from 'react-native';
 import Modal from 'react-native-modal';
-import { BlueButton, BlueSpacing40 } from '../BlueComponents';
+import { BlueButton, BlueSpacing10 } from '../BlueComponents';
 import loc from '../loc';
 import { useTheme } from '@react-navigation/native';
 
@@ -54,7 +54,7 @@ const BottomModal = ({
       {doneButton && (
         <View style={[styles.hasDoneButton, stylesHook.hasDoneButton]}>
           <BlueButton title={loc.send.input_done} onPress={onClose} />
-          <BlueSpacing40 />
+          <BlueSpacing10 />
         </View>
       )}
     </Modal>
diff --git a/screen/wallets/addMultisig.js b/screen/wallets/addMultisig.js
index 17d72709a..22d7fb0e9 100644
--- a/screen/wallets/addMultisig.js
+++ b/screen/wallets/addMultisig.js
@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect, useContext } from 'react';
-import { Keyboard, KeyboardAvoidingView, Platform, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
+import { Keyboard, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 import LottieView from 'lottie-react-native';
 import { Icon } from 'react-native-elements';
 import { useNavigation, useRoute, useTheme } from '@react-navigation/native';
@@ -101,9 +101,9 @@ const WalletsAddMultisig = () => {
 
   const renderModal = () => {
     return (
-      <BottomModal isVisible={isModalVisible} onClose={closeModal} doneButton>
-        <KeyboardAvoidingView enabled={!Platform.isPad} behavior={Platform.OS === 'ios' ? 'position' : null}>
-          <View style={[styles.modalContentShort, stylesHook.modalContentShort]}>
+      <BottomModal isVisible={isModalVisible} onClose={closeModal} doneButton propagateSwipe>
+        <View style={[styles.modalContentShort, stylesHook.modalContentShort]}>
+          <ScrollView>
             <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>
             <View style={styles.rowCenter}>
@@ -162,8 +162,8 @@ const WalletsAddMultisig = () => {
               checkmark={isP2sh()}
               containerStyle={[styles.borderRadius6, styles.item, isP2sh() ? stylesHook.selectedItem : stylesHook.deSelectedItem]}
             />
-          </View>
-        </KeyboardAvoidingView>
+          </ScrollView>
+        </View>
       </BottomModal>
     );
   };
@@ -245,7 +245,8 @@ const styles = StyleSheet.create({
     flex: 0.8,
   },
   modalContentShort: {
-    padding: 24,
+    paddingHorizontal: 24,
+    paddingTop: 24,
     justifyContent: 'center',
     borderTopLeftRadius: 16,
     borderTopRightRadius: 16,