diff --git a/components/Screen.tsx b/components/Screen.tsx index b0dce5f32..b74f6de27 100644 --- a/components/Screen.tsx +++ b/components/Screen.tsx @@ -1,12 +1,17 @@ import { observer } from 'mobx-react'; -import React from 'react'; -import { SafeAreaView } from 'react-native'; +import { PureComponent, ReactNode } from 'react'; +import { SafeAreaView, ViewStyle } from 'react-native'; import LinearGradient from 'react-native-linear-gradient'; import { themeColor } from '../utils/ThemeUtils'; +interface ScreenProps { + children?: ReactNode; + style?: ViewStyle; +} + @observer -export default class Screen extends React.PureComponent { +export default class Screen extends PureComponent { render() { return ( ( + /> ); diff --git a/views/LnurlPay/Success.tsx b/views/LnurlPay/Success.tsx index f19a740ee..a1b136c9f 100644 --- a/views/LnurlPay/Success.tsx +++ b/views/LnurlPay/Success.tsx @@ -80,7 +80,7 @@ export default class LnurlPaySuccess extends React.Component diff --git a/views/SendingLightning.tsx b/views/SendingLightning.tsx index d0c0b838d..eb45b09f0 100644 --- a/views/SendingLightning.tsx +++ b/views/SendingLightning.tsx @@ -184,7 +184,7 @@ export default class SendingLightning extends React.Component< color: themeColor('text'), paddingTop: windowSize.height * 0.03, - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', fontSize: windowSize.width * windowSize.scale * @@ -247,7 +247,7 @@ export default class SendingLightning extends React.Component<
} + containerStyle={{ borderBottomWidth: 0 }} + rightComponent={SendScreen ? undefined : } navigation={navigation} /> {contacts.length > 0 && ( @@ -355,6 +353,7 @@ export default class Contacts extends React.Component< data={favoriteContacts} renderItem={this.renderContactItem} keyExtractor={(item, index) => index.toString()} + scrollEnabled={false} /> {/* Render non-favorite contacts */} @@ -384,6 +383,7 @@ export default class Contacts extends React.Component< data={nonFavoriteContacts} renderItem={this.renderContactItem} keyExtractor={(item, index) => index.toString()} + scrollEnabled={false} /> {loading ? ( diff --git a/views/Settings/PointOfSale.tsx b/views/Settings/PointOfSale.tsx index 7252dcf4e..ed80c627f 100644 --- a/views/Settings/PointOfSale.tsx +++ b/views/Settings/PointOfSale.tsx @@ -451,6 +451,7 @@ export default class PointOfSale extends React.Component< keyExtractor={(item, index) => `${item.label}-${index}` } + scrollEnabled={false} /> )} diff --git a/views/Settings/Security.tsx b/views/Settings/Security.tsx index 17ca29513..c92f522cb 100644 --- a/views/Settings/Security.tsx +++ b/views/Settings/Security.tsx @@ -247,6 +247,7 @@ export default class Security extends React.Component< `${item.translateKey}-${index}` } ItemSeparatorComponent={this.renderSeparator} + scrollEnabled={false} /> {settings.supportedBiometryType !== undefined && ( {item.label}