From 69e20b8020045b7c8ff3b1261ab661f49bc062e4 Mon Sep 17 00:00:00 2001 From: Evan Kaloudis Date: Sun, 26 Mar 2023 17:39:34 -0400 Subject: [PATCH] Components: Header --- components/Header.tsx | 36 ++++++ components/Screen.tsx | 5 +- components/WalletHeader.tsx | 7 +- views/Accounts/Accounts.tsx | 29 ++--- views/Accounts/ImportAccount.tsx | 10 +- views/Activity/Activity.tsx | 7 +- views/Activity/ActivityFilter.tsx | 21 ++- views/BumpFee.tsx | 7 +- views/Channels/Channel.tsx | 7 +- views/EditFee.tsx | 7 +- views/IntroSplash.tsx | 22 ++-- views/Invoice.tsx | 21 ++- views/LnurlAuth.tsx | 27 ++-- views/LnurlChannel.tsx | 25 ++-- views/LnurlPay/LnurlPay.tsx | 31 ++--- views/Lockscreen.tsx | 29 ++--- views/NodeInfo.tsx | 23 ++-- views/OpenChannel.tsx | 55 ++++---- views/Order.tsx | 29 ++--- views/Payment.tsx | 25 ++-- views/PaymentRequest.tsx | 7 +- views/Receive.tsx | 7 +- views/Routing/Routing.tsx | 9 +- views/Routing/RoutingEvent.tsx | 23 ++-- views/Routing/SetFees.tsx | 7 +- views/Send.tsx | 60 +++++---- views/Settings/About.tsx | 7 +- views/Settings/CertInstallInstructions.tsx | 144 +++++++++++---------- views/Settings/Currency.tsx | 17 +-- views/Settings/Display.tsx | 19 ++- views/Settings/Help.tsx | 15 +-- views/Settings/InvoicesSettings.tsx | 7 +- views/Settings/Language.tsx | 15 +-- views/Settings/Mortals.tsx | 21 ++- views/Settings/NodeConfiguration.tsx | 43 +++--- views/Settings/Nodes.tsx | 25 ++-- views/Settings/Olympians.tsx | 21 ++- views/Settings/PaymentsSettings.tsx | 7 +- views/Settings/PointOfSale.tsx | 23 ++-- views/Settings/PointOfSaleRecon.tsx | 9 +- views/Settings/PointOfSaleReconExport.tsx | 10 +- views/Settings/Privacy.tsx | 23 ++-- views/Settings/Security.tsx | 17 +-- views/Settings/SetDuressPassword.tsx | 7 +- views/Settings/SetDuressPin.tsx | 16 +-- views/Settings/SetPassword.tsx | 21 ++- views/Settings/SetPin.tsx | 11 +- views/Settings/Settings.tsx | 19 ++- views/Settings/SignVerifyMessage.tsx | 25 ++-- views/Settings/Sponsors.tsx | 7 +- views/Transaction.tsx | 7 +- views/UTXOs/CoinControl.tsx | 7 +- views/UTXOs/UTXO.tsx | 7 +- 53 files changed, 486 insertions(+), 600 deletions(-) create mode 100644 components/Header.tsx diff --git a/components/Header.tsx b/components/Header.tsx new file mode 100644 index 0000000000..8fb9eb752b --- /dev/null +++ b/components/Header.tsx @@ -0,0 +1,36 @@ +import React from 'react'; +import { Header } from 'react-native-elements'; + +interface HeaderProps { + leftComponent?: any; + centerComponent?: any; + rightComponent?: any; + containerStyle?: any; + placement?: 'left' | 'center' | 'right' | undefined; +} + +function ZeusHeader(props: HeaderProps) { + const { + leftComponent, + centerComponent, + rightComponent, + containerStyle, + placement + } = props; + return ( +
+ ); +} + +export default ZeusHeader; diff --git a/components/Screen.tsx b/components/Screen.tsx index 5542c833bc..5295e87745 100644 --- a/components/Screen.tsx +++ b/components/Screen.tsx @@ -1,5 +1,4 @@ import React from 'react'; -import { SafeAreaView } from 'react-native'; import LinearGradient from 'react-native-linear-gradient'; import { themeColor } from '../utils/ThemeUtils'; @@ -17,9 +16,7 @@ export default class Screen extends React.PureComponent { flex: 1 }} > - - {this.props.children} - + {this.props.children} ); } diff --git a/components/WalletHeader.tsx b/components/WalletHeader.tsx index a9df3371aa..2b38fcf0cf 100644 --- a/components/WalletHeader.tsx +++ b/components/WalletHeader.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Badge, Header } from 'react-native-elements'; +import { Badge } from 'react-native-elements'; import { Image, TouchableOpacity, View } from 'react-native'; import { inject, observer } from 'mobx-react'; import Clipboard from '@react-native-clipboard/clipboard'; @@ -10,6 +10,7 @@ import NodeInfoStore from '../stores/NodeInfoStore'; import PosStore from '../stores/PosStore'; import Button from '../components/Button'; +import Header from './Header'; import LoadingIndicator from '../components/LoadingIndicator'; import NodeIdenticon from '../components/NodeIdenticon'; @@ -342,10 +343,6 @@ export default class WalletHeader extends React.Component< ) } - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> ); } diff --git a/views/Accounts/Accounts.tsx b/views/Accounts/Accounts.tsx index aa8881c5b7..5984eba3bc 100644 --- a/views/Accounts/Accounts.tsx +++ b/views/Accounts/Accounts.tsx @@ -1,20 +1,21 @@ import * as React from 'react'; -import { Header, Icon } from 'react-native-elements'; +import { Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; -import Button from './../../components/Button'; -import LayerBalances from './../../components/LayerBalances'; -import LoadingIndicator from './../../components/LoadingIndicator'; -import Screen from './../../components/Screen'; +import Button from '../../components/Button'; +import Header from '../../components/Header'; +import LayerBalances from '../../components/LayerBalances'; +import LoadingIndicator from '../../components/LoadingIndicator'; +import Screen from '../../components/Screen'; -import BalanceStore from './../../stores/BalanceStore'; -import UnitsStore from './../../stores/UnitsStore'; -import UTXOsStore from './../../stores/UTXOsStore'; -import SettingsStore from './../../stores/SettingsStore'; +import BalanceStore from '../../stores/BalanceStore'; +import UnitsStore from '../../stores/UnitsStore'; +import UTXOsStore from '../../stores/UTXOsStore'; +import SettingsStore from '../../stores/SettingsStore'; -import BackendUtils from './../../utils/BackendUtils'; -import { localeString } from './../../utils/LocaleUtils'; -import { themeColor } from './../../utils/ThemeUtils'; +import BackendUtils from '../../utils/BackendUtils'; +import { localeString } from '../../utils/LocaleUtils'; +import { themeColor } from '../../utils/ThemeUtils'; interface AccountsProps { navigation: any; @@ -116,10 +117,6 @@ export default class Accounts extends React.Component< style: { color: themeColor('text') } }} rightComponent={value ? null : } - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> {loadingAccounts && } {!loadingAccounts && ( diff --git a/views/Accounts/ImportAccount.tsx b/views/Accounts/ImportAccount.tsx index 86f8210578..f18c4f352b 100644 --- a/views/Accounts/ImportAccount.tsx +++ b/views/Accounts/ImportAccount.tsx @@ -1,10 +1,11 @@ import * as React from 'react'; import { ScrollView, StyleSheet, Text, View } from 'react-native'; -import { Button, Header, Icon } from 'react-native-elements'; +import { Button, Icon } from 'react-native-elements'; -import TextInput from './../../components/TextInput'; -import { localeString } from './../../utils/LocaleUtils'; -import { themeColor } from './../../utils/ThemeUtils'; +import Header from '../../components/Header'; +import TextInput from '../../components/TextInput'; +import { localeString } from '../../utils/LocaleUtils'; +import { themeColor } from '../../utils/ThemeUtils'; interface ImportAccountProps { exitSetup: any; @@ -87,7 +88,6 @@ export default class ImportAccount extends React.Component< text: localeString('views.ImportAccount.title'), style: { color: themeColor('text') } }} - backgroundColor="grey" /> { } }} rightComponent={} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> {loading ? ( diff --git a/views/Activity/ActivityFilter.tsx b/views/Activity/ActivityFilter.tsx index dd0ced0f5b..28ccd86c6b 100644 --- a/views/Activity/ActivityFilter.tsx +++ b/views/Activity/ActivityFilter.tsx @@ -1,20 +1,21 @@ import * as React from 'react'; import { FlatList, StyleSheet, Text, View } from 'react-native'; -import { Button, Header, Icon, ListItem } from 'react-native-elements'; +import { Button, Icon, ListItem } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; import { isEqual } from 'lodash'; import DatePicker from 'react-native-date-picker'; -import { localeString } from './../../utils/LocaleUtils'; -import { themeColor } from './../../utils/ThemeUtils'; +import { localeString } from '../../utils/LocaleUtils'; +import { themeColor } from '../../utils/ThemeUtils'; -import ActivityStore, { DEFAULT_FILTERS } from './../../stores/ActivityStore'; +import ActivityStore, { DEFAULT_FILTERS } from '../../stores/ActivityStore'; -import Screen from './../../components/Screen'; -import Switch from './../../components/Switch'; -import TextInput from './../../components/TextInput'; -import ZeusButton from './../../components/Button'; +import Header from '../../components/Header'; +import Screen from '../../components/Screen'; +import Switch from '../../components/Switch'; +import TextInput from '../../components/TextInput'; +import ZeusButton from '../../components/Button'; interface ActivityFilterProps { navigation: any; @@ -297,10 +298,6 @@ export default class ActivityFilter extends React.Component< ) } - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> } centerComponent={centerComponent} rightComponent={} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} placement="right" /> diff --git a/views/EditFee.tsx b/views/EditFee.tsx index 4a086ab5e1..4b058859e2 100644 --- a/views/EditFee.tsx +++ b/views/EditFee.tsx @@ -8,10 +8,11 @@ import { TouchableOpacity, TouchableWithoutFeedback } from 'react-native'; -import { Icon, Header } from 'react-native-elements'; +import { Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; import Button from '../components/Button'; +import Header from '../components/Header'; import LightningIndicator from '../components/LightningIndicator'; import Screen from '../components/Screen'; @@ -84,12 +85,8 @@ export default class EditFee extends React.Component< : localeString('views.EditFee.title'), style: { color: themeColor('text') } }} - backgroundColor="transparent" leftComponent={} rightComponent={} - containerStyle={{ - borderBottomWidth: 0 - }} /> { return ( -
} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} - /> +
} /> { fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> diff --git a/views/LnurlAuth.tsx b/views/LnurlAuth.tsx index 96cc26520d..975ee15ea6 100644 --- a/views/LnurlAuth.tsx +++ b/views/LnurlAuth.tsx @@ -3,24 +3,25 @@ import * as React from 'react'; import ReactNativeBlobUtil from 'react-native-blob-util'; import { inject, observer } from 'mobx-react'; import { Alert, StyleSheet, Text, View } from 'react-native'; -import { Header, Icon } from 'react-native-elements'; +import { Icon } from 'react-native-elements'; import querystring from 'querystring-es3'; import { HMAC as sha256HMAC } from 'fast-sha256'; -import Button from './../components/Button'; -import LightningIndicator from './../components/LightningIndicator'; -import Screen from './../components/Screen'; +import Button from '../components/Button'; +import Header from '../components/Header'; +import LightningIndicator from '../components/LightningIndicator'; +import Screen from '../components/Screen'; import { SuccessMessage, ErrorMessage -} from './../components/SuccessErrorMessage'; +} from '../components/SuccessErrorMessage'; -import { themeColor } from './../utils/ThemeUtils'; -import { localeString } from './../utils/LocaleUtils'; -import BackendUtils from './../utils/BackendUtils'; -import Base64Utils from './../utils/Base64Utils'; -import DropdownSetting from './../components/DropdownSetting'; -import SettingsStore, { LNDHUB_AUTH_MODES } from './../stores/SettingsStore'; +import { themeColor } from '../utils/ThemeUtils'; +import { localeString } from '../utils/LocaleUtils'; +import BackendUtils from '../utils/BackendUtils'; +import Base64Utils from '../utils/Base64Utils'; +import DropdownSetting from '../components/DropdownSetting'; +import SettingsStore, { LNDHUB_AUTH_MODES } from '../stores/SettingsStore'; const EC = require('elliptic').ec; const ec = new EC('secp256k1'); @@ -272,10 +273,6 @@ export default class LnurlAuth extends React.Component< fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> {(!!modifySecurityScreen || deletePin || deleteDuressPin) && ( -
} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} - /> +
} /> )} {!!passphrase && ( diff --git a/views/NodeInfo.tsx b/views/NodeInfo.tsx index 31bb3bbb06..03cb7704ab 100644 --- a/views/NodeInfo.tsx +++ b/views/NodeInfo.tsx @@ -1,18 +1,19 @@ import * as React from 'react'; import { StyleSheet, ScrollView, Text } from 'react-native'; -import { Header, Icon } from 'react-native-elements'; +import { Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; -import CollapsedQR from './../components/CollapsedQR'; -import KeyValue from './../components/KeyValue'; -import Screen from './../components/Screen'; +import CollapsedQR from '../components/CollapsedQR'; +import Header from '../components/Header'; +import KeyValue from '../components/KeyValue'; +import Screen from '../components/Screen'; -import { version } from './../package.json'; -import { localeString } from './../utils/LocaleUtils'; -import { themeColor } from './../utils/ThemeUtils'; +import { version } from '../package.json'; +import { localeString } from '../utils/LocaleUtils'; +import { themeColor } from '../utils/ThemeUtils'; -import NodeInfoStore from './../stores/NodeInfoStore'; -import SettingsStore from './../stores/SettingsStore'; +import NodeInfoStore from '../stores/NodeInfoStore'; +import SettingsStore from '../stores/SettingsStore'; interface NodeInfoProps { navigation: any; @@ -138,10 +139,6 @@ export default class NodeInfo extends React.Component { fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> diff --git a/views/OpenChannel.tsx b/views/OpenChannel.tsx index fa79f9bab0..79b87d67df 100644 --- a/views/OpenChannel.tsx +++ b/views/OpenChannel.tsx @@ -10,36 +10,37 @@ import { } from 'react-native'; import Clipboard from '@react-native-clipboard/clipboard'; import { inject, observer } from 'mobx-react'; -import { Header, Icon } from 'react-native-elements'; +import { Icon } from 'react-native-elements'; import NfcManager, { NfcEvents } from 'react-native-nfc-manager'; -import Amount from './../components/Amount'; -import Button from './../components/Button'; -import LightningIndicator from './../components/LightningIndicator'; -import Screen from './../components/Screen'; +import Amount from '../components/Amount'; +import Header from '../components/Header'; +import Button from '../components/Button'; +import LightningIndicator from '../components/LightningIndicator'; +import Screen from '../components/Screen'; import { SuccessMessage, ErrorMessage -} from './../components/SuccessErrorMessage'; -import Switch from './../components/Switch'; -import TextInput from './../components/TextInput'; -import UTXOPicker from './../components/UTXOPicker'; - -import handleAnything from './../utils/handleAnything'; -import NFCUtils from './../utils/NFCUtils'; -import NodeUriUtils from './../utils/NodeUriUtils'; -import BackendUtils from './../utils/BackendUtils'; -import { localeString } from './../utils/LocaleUtils'; -import { themeColor } from './../utils/ThemeUtils'; - -import BalanceStore from './../stores/BalanceStore'; -import ChannelsStore from './../stores/ChannelsStore'; -import FiatStore from './../stores/FiatStore'; -import SettingsStore from './../stores/SettingsStore'; -import UnitsStore, { SATS_PER_BTC } from './../stores/UnitsStore'; -import UTXOsStore from './../stores/UTXOsStore'; - -import Scan from './../assets/images/SVG/Scan.svg'; +} from '../components/SuccessErrorMessage'; +import Switch from '../components/Switch'; +import TextInput from '../components/TextInput'; +import UTXOPicker from '../components/UTXOPicker'; + +import handleAnything from '../utils/handleAnything'; +import NFCUtils from '../utils/NFCUtils'; +import NodeUriUtils from '../utils/NodeUriUtils'; +import BackendUtils from '../utils/BackendUtils'; +import { localeString } from '../utils/LocaleUtils'; +import { themeColor } from '../utils/ThemeUtils'; + +import BalanceStore from '../stores/BalanceStore'; +import ChannelsStore from '../stores/ChannelsStore'; +import FiatStore from '../stores/FiatStore'; +import SettingsStore from '../stores/SettingsStore'; +import UnitsStore, { SATS_PER_BTC } from '../stores/UnitsStore'; +import UTXOsStore from '../stores/UTXOsStore'; + +import Scan from '../assets/images/SVG/Scan.svg'; interface OpenChannelProps { exitSetup: any; @@ -314,10 +315,6 @@ export default class OpenChannel extends React.Component< } }} rightComponent={} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> { fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> diff --git a/views/Payment.tsx b/views/Payment.tsx index a35e3b87f9..07e66ef271 100644 --- a/views/Payment.tsx +++ b/views/Payment.tsx @@ -1,19 +1,20 @@ import * as React from 'react'; import { StyleSheet, ScrollView, View } from 'react-native'; -import { Header, Icon } from 'react-native-elements'; +import { Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; -import Amount from './../components/Amount'; -import KeyValue from './../components/KeyValue'; -import Screen from './../components/Screen'; +import Amount from '../components/Amount'; +import Header from '../components/Header'; +import KeyValue from '../components/KeyValue'; +import Screen from '../components/Screen'; -import Payment from './../models/Payment'; -import PrivacyUtils from './../utils/PrivacyUtils'; -import { localeString } from './../utils/LocaleUtils'; -import { themeColor } from './../utils/ThemeUtils'; +import Payment from '../models/Payment'; +import PrivacyUtils from '../utils/PrivacyUtils'; +import { localeString } from '../utils/LocaleUtils'; +import { themeColor } from '../utils/ThemeUtils'; -import SettingsStore from './../stores/SettingsStore'; -import LnurlPayStore from './../stores/LnurlPayStore'; +import SettingsStore from '../stores/SettingsStore'; +import LnurlPayStore from '../stores/LnurlPayStore'; import LnurlPayHistorical from './LnurlPay/Historical'; interface PaymentProps { @@ -77,10 +78,6 @@ export default class PaymentView extends React.Component { fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> diff --git a/views/PaymentRequest.tsx b/views/PaymentRequest.tsx index 231f3f82d3..e07226c578 100644 --- a/views/PaymentRequest.tsx +++ b/views/PaymentRequest.tsx @@ -9,9 +9,10 @@ import { TouchableOpacity } from 'react-native'; import { inject, observer } from 'mobx-react'; -import { Header, Icon } from 'react-native-elements'; +import { Icon } from 'react-native-elements'; import Amount from '../components/Amount'; +import Header from '../components/Header'; import Button from '../components/Button'; import HopPicker from '../components/HopPicker'; import KeyValue from '../components/KeyValue'; @@ -336,10 +337,6 @@ export default class PaymentRequest extends React.Component< fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> {(loading || loadingFeeEstimate) && ( diff --git a/views/Receive.tsx b/views/Receive.tsx index bd143eab68..43455c2da4 100644 --- a/views/Receive.tsx +++ b/views/Receive.tsx @@ -12,7 +12,7 @@ import { } from 'react-native'; import BigNumber from 'bignumber.js'; import { LNURLWithdrawParams } from 'js-lnurl'; -import { ButtonGroup, Header, Icon } from 'react-native-elements'; +import { ButtonGroup, Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; import _map from 'lodash/map'; @@ -30,6 +30,7 @@ import WordLogo from '../assets/images/SVG/Word Logo.svg'; import Amount from '../components/Amount'; import Button from '../components/Button'; import CollapsedQR from '../components/CollapsedQR'; +import Header from '../components/Header'; import LoadingIndicator from '../components/LoadingIndicator'; import PaidIndicator from '../components/PaidIndicator'; import ModalBox from '../components/ModalBox'; @@ -846,10 +847,6 @@ export default class Receive extends React.Component< ) ) } - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> diff --git a/views/Routing/Routing.tsx b/views/Routing/Routing.tsx index f0e46be573..45d490333d 100644 --- a/views/Routing/Routing.tsx +++ b/views/Routing/Routing.tsx @@ -1,8 +1,9 @@ import * as React from 'react'; import { FlatList, View, Text, TouchableOpacity } from 'react-native'; -import { ButtonGroup, Header, Icon } from 'react-native-elements'; +import { ButtonGroup, Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; +import Header from '../../components/Header'; import { ErrorMessage } from '../../components/SuccessErrorMessage'; import { Spacer } from '../../components/layout/Spacer'; import LoadingIndicator from '../../components/LoadingIndicator'; @@ -14,7 +15,7 @@ import FeeStore from '../../stores/FeeStore'; import BackendUtils from '../../utils/BackendUtils'; import { localeString } from '../../utils/LocaleUtils'; -import { themeColor } from './../../utils/ThemeUtils'; +import { themeColor } from '../../utils/ThemeUtils'; import { RoutingListItem } from './RoutingListItem'; import { RoutingHeader } from './RoutingHeader'; @@ -210,10 +211,6 @@ export default class Routing extends React.PureComponent< style: { color: themeColor('text') } }} rightComponent={} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> diff --git a/views/Routing/SetFees.tsx b/views/Routing/SetFees.tsx index 75ed0539f4..665e47ab46 100644 --- a/views/Routing/SetFees.tsx +++ b/views/Routing/SetFees.tsx @@ -1,8 +1,9 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Header, Icon } from 'react-native-elements'; +import { Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; +import Header from '../../components/Header'; import Screen from '../../components/Screen'; import SetFeesForm from '../../components/SetFeesForm'; @@ -100,10 +101,6 @@ export default class SetFees extends React.PureComponent { fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> { } - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> -
} - centerComponent={{ - text: localeString( - 'views.Settings.CertInstallInstructions.title' - ), - style: { - color: themeColor('text'), - fontFamily: 'Lato-Regular' - } - }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 + + - - {Platform.OS === 'android' && ( - - {localeString( - 'views.Settings.CertInstallInstructions.graph1' - )} - - )} - {Platform.OS === 'ios' && ( - - - {localeString( - 'views.Settings.CertInstallInstructions.graph2' - )} - - - {localeString( - 'views.Settings.CertInstallInstructions.graph3' - )} - + > +
} + centerComponent={{ + text: localeString( + 'views.Settings.CertInstallInstructions.title' + ), + style: { + color: themeColor('text'), + fontFamily: 'Lato-Regular' + } + }} + /> + + {Platform.OS === 'android' && ( {localeString( - 'views.Settings.CertInstallInstructions.graph4' + 'views.Settings.CertInstallInstructions.graph1' )} - - )} - - {localeString( - 'views.Settings.CertInstallInstructions.graph5' )} - - - + {Platform.OS === 'ios' && ( + + + {localeString( + 'views.Settings.CertInstallInstructions.graph2' + )} + + + {localeString( + 'views.Settings.CertInstallInstructions.graph3' + )} + + + {localeString( + 'views.Settings.CertInstallInstructions.graph4' + )} + + + )} + + {localeString( + 'views.Settings.CertInstallInstructions.graph5' + )} + + + + ); } } diff --git a/views/Settings/Currency.tsx b/views/Settings/Currency.tsx index 87428a1abf..3de1e8b9c5 100644 --- a/views/Settings/Currency.tsx +++ b/views/Settings/Currency.tsx @@ -1,15 +1,16 @@ import * as React from 'react'; import { FlatList, View } from 'react-native'; -import { Header, Icon, ListItem, SearchBar } from 'react-native-elements'; +import { Icon, ListItem, SearchBar } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; -import Screen from './../../components/Screen'; +import Screen from '../../components/Screen'; +import Header from '../../components/Header'; -import UnitsStore from './../../stores/UnitsStore'; -import SettingsStore, { CURRENCY_KEYS } from './../../stores/SettingsStore'; +import UnitsStore from '../../stores/UnitsStore'; +import SettingsStore, { CURRENCY_KEYS } from '../../stores/SettingsStore'; -import { localeString } from './../../utils/LocaleUtils'; -import { themeColor } from './../../utils/ThemeUtils'; +import { localeString } from '../../utils/LocaleUtils'; +import { themeColor } from '../../utils/ThemeUtils'; interface CurrencyProps { navigation: any; @@ -92,10 +93,6 @@ export default class Currency extends React.Component< fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> ) } - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> { fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> {loading && } {!loading && !sponsorsError && ( diff --git a/views/Settings/NodeConfiguration.tsx b/views/Settings/NodeConfiguration.tsx index 63600d8a94..997c4c7d7a 100644 --- a/views/Settings/NodeConfiguration.tsx +++ b/views/Settings/NodeConfiguration.tsx @@ -8,35 +8,36 @@ import { TouchableOpacity } from 'react-native'; import Clipboard from '@react-native-clipboard/clipboard'; -import { Header, Icon } from 'react-native-elements'; +import { Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; import EncryptedStorage from 'react-native-encrypted-storage'; -import { hash, STORAGE_KEY } from './../../backends/LNC/credentialStore'; - -import AddressUtils, { CUSTODIAL_LNDHUBS } from './../../utils/AddressUtils'; -import ConnectionFormatUtils from './../../utils/ConnectionFormatUtils'; -import { localeString } from './../../utils/LocaleUtils'; -import BackendUtils from './../../utils/BackendUtils'; -import { themeColor } from './../../utils/ThemeUtils'; - -import Button from './../../components/Button'; -import CollapsedQR from './../../components/CollapsedQR'; -import DropdownSetting from './../../components/DropdownSetting'; -import LoadingIndicator from './../../components/LoadingIndicator'; -import Screen from './../../components/Screen'; +import { hash, STORAGE_KEY } from '../../backends/LNC/credentialStore'; + +import AddressUtils, { CUSTODIAL_LNDHUBS } from '../../utils/AddressUtils'; +import ConnectionFormatUtils from '../../utils/ConnectionFormatUtils'; +import { localeString } from '../../utils/LocaleUtils'; +import BackendUtils from '../../utils/BackendUtils'; +import { themeColor } from '../../utils/ThemeUtils'; + +import Button from '../../components/Button'; +import CollapsedQR from '../../components/CollapsedQR'; +import DropdownSetting from '../../components/DropdownSetting'; +import Header from '../../components/Header'; +import LoadingIndicator from '../../components/LoadingIndicator'; +import Screen from '../../components/Screen'; import { SuccessMessage, ErrorMessage -} from './../../components/SuccessErrorMessage'; -import Switch from './../../components/Switch'; -import TextInput from './../../components/TextInput'; +} from '../../components/SuccessErrorMessage'; +import Switch from '../../components/Switch'; +import TextInput from '../../components/TextInput'; import SettingsStore, { INTERFACE_KEYS, LNC_MAILBOX_KEYS -} from './../../stores/SettingsStore'; +} from '../../stores/SettingsStore'; -import Scan from './../../assets/images/SVG/Scan.svg'; +import Scan from '../../assets/images/SVG/Scan.svg'; interface NodeConfigurationProps { navigation: any; @@ -555,10 +556,6 @@ export default class NodeConfiguration extends React.Component< /> ) } - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> {!!suggestImport && ( diff --git a/views/Settings/Nodes.tsx b/views/Settings/Nodes.tsx index 57822842b5..3ca27ae18b 100644 --- a/views/Settings/Nodes.tsx +++ b/views/Settings/Nodes.tsx @@ -1,19 +1,20 @@ import * as React from 'react'; import { FlatList, View } from 'react-native'; -import { Header, Icon, ListItem } from 'react-native-elements'; +import { Icon, ListItem } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; -import Button from './../../components/Button'; -import LoadingIndicator from './../../components/LoadingIndicator'; -import NodeIdenticon, { NodeTitle } from './../../components/NodeIdenticon'; -import Screen from './../../components/Screen'; +import Button from '../../components/Button'; +import Header from '../../components/Header'; +import LoadingIndicator from '../../components/LoadingIndicator'; +import NodeIdenticon, { NodeTitle } from '../../components/NodeIdenticon'; +import Screen from '../../components/Screen'; -import BackendUtils from './../../utils/BackendUtils'; -import BalanceStore from './../../stores/BalanceStore'; +import BackendUtils from '../../utils/BackendUtils'; +import BalanceStore from '../../stores/BalanceStore'; import NodeInfoStore from '../../stores/NodeInfoStore'; -import SettingsStore, { INTERFACE_KEYS } from './../../stores/SettingsStore'; -import { localeString } from './../../utils/LocaleUtils'; -import { themeColor } from './../../utils/ThemeUtils'; +import SettingsStore, { INTERFACE_KEYS } from '../../stores/SettingsStore'; +import { localeString } from '../../utils/LocaleUtils'; +import { themeColor } from '../../utils/ThemeUtils'; import ChannelsStore from '../../stores/ChannelsStore'; interface NodesProps { @@ -130,10 +131,6 @@ export default class Nodes extends React.Component { } }} rightComponent={} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> {!!nodes && nodes.length > 0 && ( { fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> {loading && } {!loading && !sponsorsError && ( diff --git a/views/Settings/PaymentsSettings.tsx b/views/Settings/PaymentsSettings.tsx index 652bfcc663..d65d2284e9 100644 --- a/views/Settings/PaymentsSettings.tsx +++ b/views/Settings/PaymentsSettings.tsx @@ -1,8 +1,9 @@ import * as React from 'react'; import { Text, View } from 'react-native'; -import { Header, Icon } from 'react-native-elements'; +import { Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; +import Header from '../../components/Header'; import Screen from '../../components/Screen'; import SettingsStore from '../../stores/SettingsStore'; @@ -86,10 +87,6 @@ export default class PaymentsSettings extends React.Component< fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> {fiat === DEFAULT_FIAT ? ( diff --git a/views/Settings/PointOfSaleRecon.tsx b/views/Settings/PointOfSaleRecon.tsx index 4a1dfae0a7..c786c66873 100644 --- a/views/Settings/PointOfSaleRecon.tsx +++ b/views/Settings/PointOfSaleRecon.tsx @@ -6,10 +6,11 @@ import { TouchableHighlight, TouchableOpacity } from 'react-native'; -import { ButtonGroup, Header, Icon } from 'react-native-elements'; +import { ButtonGroup, Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; import BigNumber from 'bignumber.js'; +import Header from '../../components/Header'; import Screen from '../../components/Screen'; import { ErrorMessage } from '../../components/SuccessErrorMessage'; import { Spacer } from '../../components/layout/Spacer'; @@ -23,7 +24,7 @@ import { SATS_PER_BTC } from '../../stores/UnitsStore'; import BackendUtils from '../../utils/BackendUtils'; import { localeString } from '../../utils/LocaleUtils'; -import { themeColor } from './../../utils/ThemeUtils'; +import { themeColor } from '../../utils/ThemeUtils'; import { ReconHeader } from './PointOfSaleReconHeader'; @@ -236,10 +237,6 @@ export default class PointOfSaleRecon extends React.PureComponent< style: { color: themeColor('text') } }} rightComponent={} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> } - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> diff --git a/views/Settings/Privacy.tsx b/views/Settings/Privacy.tsx index f57e4c2d5d..34303a4493 100644 --- a/views/Settings/Privacy.tsx +++ b/views/Settings/Privacy.tsx @@ -1,17 +1,16 @@ import * as React from 'react'; import { ScrollView, Text, View } from 'react-native'; -import { Header, Icon, ListItem } from 'react-native-elements'; +import { Icon, ListItem } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; -import SettingsStore, { - BLOCK_EXPLORER_KEYS -} from './../../stores/SettingsStore'; -import { localeString } from './../../utils/LocaleUtils'; -import { themeColor } from './../../utils/ThemeUtils'; +import SettingsStore, { BLOCK_EXPLORER_KEYS } from '../../stores/SettingsStore'; +import { localeString } from '../../utils/LocaleUtils'; +import { themeColor } from '../../utils/ThemeUtils'; -import DropdownSetting from './../../components/DropdownSetting'; -import Screen from './../../components/Screen'; -import Switch from './../../components/Switch'; -import TextInput from './../../components/TextInput'; +import DropdownSetting from '../../components/DropdownSetting'; +import Header from '../../components/Header'; +import Screen from '../../components/Screen'; +import Switch from '../../components/Switch'; +import TextInput from '../../components/TextInput'; interface PrivacyProps { navigation: any; @@ -110,10 +109,6 @@ export default class Privacy extends React.Component< fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> -
} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} - /> +
} /> { return ( -
} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} - /> +
} /> diff --git a/views/Settings/Sponsors.tsx b/views/Settings/Sponsors.tsx index 9b0da89ff7..9ea9109891 100644 --- a/views/Settings/Sponsors.tsx +++ b/views/Settings/Sponsors.tsx @@ -1,7 +1,8 @@ import * as React from 'react'; import { FlatList, View } from 'react-native'; -import { Header, Icon, ListItem } from 'react-native-elements'; +import { Icon, ListItem } from 'react-native-elements'; +import Header from '../../components/Header'; import Screen from '../../components/Screen'; import { localeString } from '../../utils/LocaleUtils'; @@ -49,10 +50,6 @@ function Sponsors(props: SponsorsProps) { fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> { fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> { fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} /> {loading ? ( diff --git a/views/UTXOs/UTXO.tsx b/views/UTXOs/UTXO.tsx index b702228ccf..db418deb02 100644 --- a/views/UTXOs/UTXO.tsx +++ b/views/UTXOs/UTXO.tsx @@ -6,10 +6,11 @@ import { TouchableOpacity, View } from 'react-native'; -import { Header, Icon } from 'react-native-elements'; +import { Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; import Amount from './../../components/Amount'; +import Header from '../../components/Header'; import KeyValue from './../../components/KeyValue'; import Screen from './../../components/Screen'; @@ -59,10 +60,6 @@ export default class UTXO extends React.Component { fontFamily: 'Lato-Regular' } }} - backgroundColor="transparent" - containerStyle={{ - borderBottomWidth: 0 - }} />