From 8c69c40361d9e2556172a9da8d6bcd29d5ef770a Mon Sep 17 00:00:00 2001
From: deregs <deregs@protonmail.com>
Date: Tue, 15 Feb 2022 23:47:08 -0500
Subject: [PATCH 1/3] fixed keyboard collapse on set fees form

---
 components/SetFeesForm.tsx | 341 +++++++++++++++++++------------------
 1 file changed, 176 insertions(+), 165 deletions(-)

diff --git a/components/SetFeesForm.tsx b/components/SetFeesForm.tsx
index b50bb0187b..f3a3de818d 100644
--- a/components/SetFeesForm.tsx
+++ b/components/SetFeesForm.tsx
@@ -1,5 +1,11 @@
 import * as React from 'react';
-import { StyleSheet, Text, View } from 'react-native';
+import {
+    StyleSheet,
+    Text,
+    View,
+    Keyboard,
+    TouchableWithoutFeedback
+} from 'react-native';
 import { inject, observer } from 'mobx-react';
 
 import Button from './../components/Button';
@@ -124,183 +130,188 @@ export default class SetFeesForm extends React.Component<
                 )}
 
                 {(expanded || showNewFeesForm) && (
-                    <View style={{ paddingTop: 15 }}>
-                        {loading && <LoadingIndicator />}
-                        {feesSubmitted && setFeesSuccess && (
-                            <SuccessMessage
-                                message={localeString(
-                                    'components.SetFeesForm.success'
-                                )}
+                    <TouchableWithoutFeedback
+                        onPress={Keyboard.dismiss}
+                        accessible={false}
+                    >
+                        <View style={{ paddingTop: 15 }}>
+                            {loading && <LoadingIndicator />}
+                            {feesSubmitted && setFeesSuccess && (
+                                <SuccessMessage
+                                    message={localeString(
+                                        'components.SetFeesForm.success'
+                                    )}
+                                />
+                            )}
+                            {feesSubmitted && setFeesError && (
+                                <ErrorMessage
+                                    message={
+                                        setFeesErrorMsg
+                                            ? setFeesErrorMsg
+                                            : localeString(
+                                                  'components.SetFeesForm.error'
+                                              )
+                                    }
+                                />
+                            )}
+
+                            <Text
+                                style={{
+                                    ...styles.text,
+                                    color: themeColor('secondaryText')
+                                }}
+                            >
+                                {`${localeString(
+                                    'components.SetFeesForm.baseFee'
+                                )} (${localeString('general.sats')})`}
+                            </Text>
+                            <TextInput
+                                keyboardType="numeric"
+                                placeholder={baseFee || '1'}
+                                value={newBaseFee}
+                                onChangeText={(text: string) =>
+                                    this.setState({
+                                        newBaseFee: text
+                                    })
+                                }
+                                autoCapitalize="none"
+                                autoCorrect={false}
                             />
-                        )}
-                        {feesSubmitted && setFeesError && (
-                            <ErrorMessage
-                                message={
-                                    setFeesErrorMsg
-                                        ? setFeesErrorMsg
-                                        : localeString(
-                                              'components.SetFeesForm.error'
+
+                            <Text
+                                style={{
+                                    ...styles.text,
+                                    color: themeColor('secondaryText')
+                                }}
+                            >
+                                {`${localeString(
+                                    'components.SetFeesForm.feeRate'
+                                )} (${
+                                    implementation === 'c-lightning-REST'
+                                        ? localeString(
+                                              'components.SetFeesForm.ppmMilliMsat'
                                           )
+                                        : localeString('general.percentage')
+                                })`}
+                            </Text>
+                            <TextInput
+                                keyboardType="numeric"
+                                placeholder={feeRate || '1'}
+                                value={newFeeRate}
+                                onChangeText={(text: string) =>
+                                    this.setState({
+                                        newFeeRate: text
+                                    })
                                 }
+                                autoCapitalize="none"
+                                autoCorrect={false}
                             />
-                        )}
 
-                        <Text
-                            style={{
-                                ...styles.text,
-                                color: themeColor('secondaryText')
-                            }}
-                        >
-                            {`${localeString(
-                                'components.SetFeesForm.baseFee'
-                            )} (${localeString('general.sats')})`}
-                        </Text>
-                        <TextInput
-                            keyboardType="numeric"
-                            placeholder={baseFee || '1'}
-                            value={newBaseFee}
-                            onChangeText={(text: string) =>
-                                this.setState({
-                                    newBaseFee: text
-                                })
-                            }
-                            autoCapitalize="none"
-                            autoCorrect={false}
-                        />
+                            <Text
+                                style={{
+                                    ...styles.text,
+                                    color: themeColor('secondaryText')
+                                }}
+                            >
+                                {localeString(
+                                    'components.SetFeesForm.timeLockDelta'
+                                )}
+                            </Text>
+                            <TextInput
+                                keyboardType="numeric"
+                                placeholder={timeLockDelta || '144'}
+                                value={newTimeLockDelta}
+                                onChangeText={(text: string) =>
+                                    this.setState({
+                                        newTimeLockDelta: text
+                                    })
+                                }
+                                autoCapitalize="none"
+                                autoCorrect={false}
+                            />
 
-                        <Text
-                            style={{
-                                ...styles.text,
-                                color: themeColor('secondaryText')
-                            }}
-                        >
-                            {`${localeString(
-                                'components.SetFeesForm.feeRate'
-                            )} (${
-                                implementation === 'c-lightning-REST'
-                                    ? localeString(
-                                          'components.SetFeesForm.ppmMilliMsat'
-                                      )
-                                    : localeString('general.percentage')
-                            })`}
-                        </Text>
-                        <TextInput
-                            keyboardType="numeric"
-                            placeholder={feeRate || '1'}
-                            value={newFeeRate}
-                            onChangeText={(text: string) =>
-                                this.setState({
-                                    newFeeRate: text
-                                })
-                            }
-                            autoCapitalize="none"
-                            autoCorrect={false}
-                        />
+                            {implementation === 'lnd' && (
+                                <>
+                                    <Text
+                                        style={{
+                                            ...styles.text,
+                                            color: themeColor('secondaryText')
+                                        }}
+                                    >
+                                        {localeString(
+                                            'components.SetFeesForm.minHtlc'
+                                        )}
+                                    </Text>
+                                    <TextInput
+                                        keyboardType="numeric"
+                                        placeholder={minHTLC || '1'}
+                                        value={newMinHtlc}
+                                        onChangeText={(text: string) =>
+                                            this.setState({
+                                                newMinHtlc: text
+                                            })
+                                        }
+                                        autoCapitalize="none"
+                                        autoCorrect={false}
+                                    />
 
-                        <Text
-                            style={{
-                                ...styles.text,
-                                color: themeColor('secondaryText')
-                            }}
-                        >
-                            {localeString(
-                                'components.SetFeesForm.timeLockDelta'
+                                    <Text
+                                        style={{
+                                            ...styles.text,
+                                            color: themeColor('secondaryText')
+                                        }}
+                                    >
+                                        {localeString(
+                                            'components.SetFeesForm.maxHtlc'
+                                        )}
+                                    </Text>
+                                    <TextInput
+                                        keyboardType="numeric"
+                                        placeholder={maxHTLC || '250000'}
+                                        value={newMaxHtlc}
+                                        onChangeText={(text: string) =>
+                                            this.setState({
+                                                newMaxHtlc: text
+                                            })
+                                        }
+                                        autoCapitalize="none"
+                                        autoCorrect={false}
+                                    />
+                                </>
                             )}
-                        </Text>
-                        <TextInput
-                            keyboardType="numeric"
-                            placeholder={timeLockDelta || '144'}
-                            value={newTimeLockDelta}
-                            onChangeText={(text: string) =>
-                                this.setState({
-                                    newTimeLockDelta: text
-                                })
-                            }
-                            autoCapitalize="none"
-                            autoCorrect={false}
-                        />
 
-                        {implementation === 'lnd' && (
-                            <>
-                                <Text
-                                    style={{
-                                        ...styles.text,
-                                        color: themeColor('secondaryText')
-                                    }}
-                                >
-                                    {localeString(
-                                        'components.SetFeesForm.minHtlc'
+                            <View style={styles.button}>
+                                <Button
+                                    title={localeString(
+                                        'components.SetFeesForm.submit'
                                     )}
-                                </Text>
-                                <TextInput
-                                    keyboardType="numeric"
-                                    placeholder={minHTLC || '1'}
-                                    value={newMinHtlc}
-                                    onChangeText={(text: string) =>
-                                        this.setState({
-                                            newMinHtlc: text
-                                        })
-                                    }
-                                    autoCapitalize="none"
-                                    autoCorrect={false}
-                                />
-
-                                <Text
-                                    style={{
-                                        ...styles.text,
-                                        color: themeColor('secondaryText')
+                                    onPress={() => {
+                                        setFees(
+                                            newBaseFee,
+                                            newFeeRate,
+                                            Number(newTimeLockDelta),
+                                            channelPoint,
+                                            channelId,
+                                            newMinHtlc,
+                                            newMaxHtlc
+                                        ).then(() => {
+                                            if (
+                                                channelId &&
+                                                implementation === 'lnd' &&
+                                                !setFeesError
+                                            ) {
+                                                ChannelsStore.getChannelInfo(
+                                                    channelId
+                                                );
+                                            }
+                                        });
+                                        this.setState({ feesSubmitted: true });
                                     }}
-                                >
-                                    {localeString(
-                                        'components.SetFeesForm.maxHtlc'
-                                    )}
-                                </Text>
-                                <TextInput
-                                    keyboardType="numeric"
-                                    placeholder={maxHTLC || '250000'}
-                                    value={newMaxHtlc}
-                                    onChangeText={(text: string) =>
-                                        this.setState({
-                                            newMaxHtlc: text
-                                        })
-                                    }
-                                    autoCapitalize="none"
-                                    autoCorrect={false}
+                                    tertiary
                                 />
-                            </>
-                        )}
-
-                        <View style={styles.button}>
-                            <Button
-                                title={localeString(
-                                    'components.SetFeesForm.submit'
-                                )}
-                                onPress={() => {
-                                    setFees(
-                                        newBaseFee,
-                                        newFeeRate,
-                                        Number(newTimeLockDelta),
-                                        channelPoint,
-                                        channelId,
-                                        newMinHtlc,
-                                        newMaxHtlc
-                                    ).then(() => {
-                                        if (
-                                            channelId &&
-                                            implementation === 'lnd' &&
-                                            !setFeesError
-                                        ) {
-                                            ChannelsStore.getChannelInfo(
-                                                channelId
-                                            );
-                                        }
-                                    });
-                                    this.setState({ feesSubmitted: true });
-                                }}
-                                tertiary
-                            />
+                            </View>
                         </View>
-                    </View>
+                    </TouchableWithoutFeedback>
                 )}
             </React.Fragment>
         );

From 147b41ef177bdd5b8c04566f69b5582e7f809ef9 Mon Sep 17 00:00:00 2001
From: deregs <deregs@protonmail.com>
Date: Wed, 16 Feb 2022 21:19:16 -0500
Subject: [PATCH 2/3] changed set fees form to use scrollview

---
 components/SetFeesForm.tsx | 338 ++++++++++++++++++-------------------
 1 file changed, 166 insertions(+), 172 deletions(-)

diff --git a/components/SetFeesForm.tsx b/components/SetFeesForm.tsx
index f3a3de818d..ded8d05696 100644
--- a/components/SetFeesForm.tsx
+++ b/components/SetFeesForm.tsx
@@ -3,8 +3,7 @@ import {
     StyleSheet,
     Text,
     View,
-    Keyboard,
-    TouchableWithoutFeedback
+    ScrollView
 } from 'react-native';
 import { inject, observer } from 'mobx-react';
 
@@ -130,188 +129,183 @@ export default class SetFeesForm extends React.Component<
                 )}
 
                 {(expanded || showNewFeesForm) && (
-                    <TouchableWithoutFeedback
-                        onPress={Keyboard.dismiss}
-                        accessible={false}
-                    >
-                        <View style={{ paddingTop: 15 }}>
-                            {loading && <LoadingIndicator />}
-                            {feesSubmitted && setFeesSuccess && (
-                                <SuccessMessage
-                                    message={localeString(
-                                        'components.SetFeesForm.success'
-                                    )}
-                                />
-                            )}
-                            {feesSubmitted && setFeesError && (
-                                <ErrorMessage
-                                    message={
-                                        setFeesErrorMsg
-                                            ? setFeesErrorMsg
-                                            : localeString(
-                                                  'components.SetFeesForm.error'
-                                              )
-                                    }
-                                />
-                            )}
-
-                            <Text
-                                style={{
-                                    ...styles.text,
-                                    color: themeColor('secondaryText')
-                                }}
-                            >
-                                {`${localeString(
-                                    'components.SetFeesForm.baseFee'
-                                )} (${localeString('general.sats')})`}
-                            </Text>
-                            <TextInput
-                                keyboardType="numeric"
-                                placeholder={baseFee || '1'}
-                                value={newBaseFee}
-                                onChangeText={(text: string) =>
-                                    this.setState({
-                                        newBaseFee: text
-                                    })
-                                }
-                                autoCapitalize="none"
-                                autoCorrect={false}
+                    <ScrollView style={{ paddingTop: 15 }}>
+                        {loading && <LoadingIndicator />}
+                        {feesSubmitted && setFeesSuccess && (
+                            <SuccessMessage
+                                message={localeString(
+                                    'components.SetFeesForm.success'
+                                )}
                             />
-
-                            <Text
-                                style={{
-                                    ...styles.text,
-                                    color: themeColor('secondaryText')
-                                }}
-                            >
-                                {`${localeString(
-                                    'components.SetFeesForm.feeRate'
-                                )} (${
-                                    implementation === 'c-lightning-REST'
-                                        ? localeString(
-                                              'components.SetFeesForm.ppmMilliMsat'
-                                          )
-                                        : localeString('general.percentage')
-                                })`}
-                            </Text>
-                            <TextInput
-                                keyboardType="numeric"
-                                placeholder={feeRate || '1'}
-                                value={newFeeRate}
-                                onChangeText={(text: string) =>
-                                    this.setState({
-                                        newFeeRate: text
-                                    })
+                        )}
+                        {feesSubmitted && setFeesError && (
+                            <ErrorMessage
+                                message={
+                                    setFeesErrorMsg
+                                        ? setFeesErrorMsg
+                                        : localeString(
+                                                'components.SetFeesForm.error'
+                                            )
                                 }
-                                autoCapitalize="none"
-                                autoCorrect={false}
                             />
+                        )}
 
-                            <Text
-                                style={{
-                                    ...styles.text,
-                                    color: themeColor('secondaryText')
-                                }}
-                            >
-                                {localeString(
-                                    'components.SetFeesForm.timeLockDelta'
-                                )}
-                            </Text>
-                            <TextInput
-                                keyboardType="numeric"
-                                placeholder={timeLockDelta || '144'}
-                                value={newTimeLockDelta}
-                                onChangeText={(text: string) =>
-                                    this.setState({
-                                        newTimeLockDelta: text
-                                    })
-                                }
-                                autoCapitalize="none"
-                                autoCorrect={false}
-                            />
+                        <Text
+                            style={{
+                                ...styles.text,
+                                color: themeColor('secondaryText')
+                            }}
+                        >
+                            {`${localeString(
+                                'components.SetFeesForm.baseFee'
+                            )} (${localeString('general.sats')})`}
+                        </Text>
+                        <TextInput
+                            keyboardType="numeric"
+                            placeholder={baseFee || '1'}
+                            value={newBaseFee}
+                            onChangeText={(text: string) =>
+                                this.setState({
+                                    newBaseFee: text
+                                })
+                            }
+                            autoCapitalize="none"
+                            autoCorrect={false}
+                        />
 
-                            {implementation === 'lnd' && (
-                                <>
-                                    <Text
-                                        style={{
-                                            ...styles.text,
-                                            color: themeColor('secondaryText')
-                                        }}
-                                    >
-                                        {localeString(
-                                            'components.SetFeesForm.minHtlc'
-                                        )}
-                                    </Text>
-                                    <TextInput
-                                        keyboardType="numeric"
-                                        placeholder={minHTLC || '1'}
-                                        value={newMinHtlc}
-                                        onChangeText={(text: string) =>
-                                            this.setState({
-                                                newMinHtlc: text
-                                            })
-                                        }
-                                        autoCapitalize="none"
-                                        autoCorrect={false}
-                                    />
+                        <Text
+                            style={{
+                                ...styles.text,
+                                color: themeColor('secondaryText')
+                            }}
+                        >
+                            {`${localeString(
+                                'components.SetFeesForm.feeRate'
+                            )} (${
+                                implementation === 'c-lightning-REST'
+                                    ? localeString(
+                                            'components.SetFeesForm.ppmMilliMsat'
+                                        )
+                                    : localeString('general.percentage')
+                            })`}
+                        </Text>
+                        <TextInput
+                            keyboardType="numeric"
+                            placeholder={feeRate || '1'}
+                            value={newFeeRate}
+                            onChangeText={(text: string) =>
+                                this.setState({
+                                    newFeeRate: text
+                                })
+                            }
+                            autoCapitalize="none"
+                            autoCorrect={false}
+                        />
 
-                                    <Text
-                                        style={{
-                                            ...styles.text,
-                                            color: themeColor('secondaryText')
-                                        }}
-                                    >
-                                        {localeString(
-                                            'components.SetFeesForm.maxHtlc'
-                                        )}
-                                    </Text>
-                                    <TextInput
-                                        keyboardType="numeric"
-                                        placeholder={maxHTLC || '250000'}
-                                        value={newMaxHtlc}
-                                        onChangeText={(text: string) =>
-                                            this.setState({
-                                                newMaxHtlc: text
-                                            })
-                                        }
-                                        autoCapitalize="none"
-                                        autoCorrect={false}
-                                    />
-                                </>
+                        <Text
+                            style={{
+                                ...styles.text,
+                                color: themeColor('secondaryText')
+                            }}
+                        >
+                            {localeString(
+                                'components.SetFeesForm.timeLockDelta'
                             )}
+                        </Text>
+                        <TextInput
+                            keyboardType="numeric"
+                            placeholder={timeLockDelta || '144'}
+                            value={newTimeLockDelta}
+                            onChangeText={(text: string) =>
+                                this.setState({
+                                    newTimeLockDelta: text
+                                })
+                            }
+                            autoCapitalize="none"
+                            autoCorrect={false}
+                        />
 
-                            <View style={styles.button}>
-                                <Button
-                                    title={localeString(
-                                        'components.SetFeesForm.submit'
+                        {implementation === 'lnd' && (
+                            <>
+                                <Text
+                                    style={{
+                                        ...styles.text,
+                                        color: themeColor('secondaryText')
+                                    }}
+                                >
+                                    {localeString(
+                                        'components.SetFeesForm.minHtlc'
                                     )}
-                                    onPress={() => {
-                                        setFees(
-                                            newBaseFee,
-                                            newFeeRate,
-                                            Number(newTimeLockDelta),
-                                            channelPoint,
-                                            channelId,
-                                            newMinHtlc,
-                                            newMaxHtlc
-                                        ).then(() => {
-                                            if (
-                                                channelId &&
-                                                implementation === 'lnd' &&
-                                                !setFeesError
-                                            ) {
-                                                ChannelsStore.getChannelInfo(
-                                                    channelId
-                                                );
-                                            }
-                                        });
-                                        this.setState({ feesSubmitted: true });
+                                </Text>
+                                <TextInput
+                                    keyboardType="numeric"
+                                    placeholder={minHTLC || '1'}
+                                    value={newMinHtlc}
+                                    onChangeText={(text: string) =>
+                                        this.setState({
+                                            newMinHtlc: text
+                                        })
+                                    }
+                                    autoCapitalize="none"
+                                    autoCorrect={false}
+                                />
+
+                                <Text
+                                    style={{
+                                        ...styles.text,
+                                        color: themeColor('secondaryText')
                                     }}
-                                    tertiary
+                                >
+                                    {localeString(
+                                        'components.SetFeesForm.maxHtlc'
+                                    )}
+                                </Text>
+                                <TextInput
+                                    keyboardType="numeric"
+                                    placeholder={maxHTLC || '250000'}
+                                    value={newMaxHtlc}
+                                    onChangeText={(text: string) =>
+                                        this.setState({
+                                            newMaxHtlc: text
+                                        })
+                                    }
+                                    autoCapitalize="none"
+                                    autoCorrect={false}
                                 />
-                            </View>
+                            </>
+                        )}
+
+                        <View style={styles.button}>
+                            <Button
+                                title={localeString(
+                                    'components.SetFeesForm.submit'
+                                )}
+                                onPress={() => {
+                                    setFees(
+                                        newBaseFee,
+                                        newFeeRate,
+                                        Number(newTimeLockDelta),
+                                        channelPoint,
+                                        channelId,
+                                        newMinHtlc,
+                                        newMaxHtlc
+                                    ).then(() => {
+                                        if (
+                                            channelId &&
+                                            implementation === 'lnd' &&
+                                            !setFeesError
+                                        ) {
+                                            ChannelsStore.getChannelInfo(
+                                                channelId
+                                            );
+                                        }
+                                    });
+                                    this.setState({ feesSubmitted: true });
+                                }}
+                                tertiary
+                            />
                         </View>
-                    </TouchableWithoutFeedback>
+                    </ScrollView>
                 )}
             </React.Fragment>
         );

From 76dfe374119239d95a2909d4a88c9633585bba54 Mon Sep 17 00:00:00 2001
From: deregs <deregs@protonmail.com>
Date: Wed, 16 Feb 2022 21:20:25 -0500
Subject: [PATCH 3/3] prettier

---
 components/SetFeesForm.tsx | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/components/SetFeesForm.tsx b/components/SetFeesForm.tsx
index ded8d05696..581319e330 100644
--- a/components/SetFeesForm.tsx
+++ b/components/SetFeesForm.tsx
@@ -1,10 +1,5 @@
 import * as React from 'react';
-import {
-    StyleSheet,
-    Text,
-    View,
-    ScrollView
-} from 'react-native';
+import { StyleSheet, Text, View, ScrollView } from 'react-native';
 import { inject, observer } from 'mobx-react';
 
 import Button from './../components/Button';
@@ -144,8 +139,8 @@ export default class SetFeesForm extends React.Component<
                                     setFeesErrorMsg
                                         ? setFeesErrorMsg
                                         : localeString(
-                                                'components.SetFeesForm.error'
-                                            )
+                                              'components.SetFeesForm.error'
+                                          )
                                 }
                             />
                         )}
@@ -184,8 +179,8 @@ export default class SetFeesForm extends React.Component<
                             )} (${
                                 implementation === 'c-lightning-REST'
                                     ? localeString(
-                                            'components.SetFeesForm.ppmMilliMsat'
-                                        )
+                                          'components.SetFeesForm.ppmMilliMsat'
+                                      )
                                     : localeString('general.percentage')
                             })`}
                         </Text>