diff --git a/assets/images/SVG/Caret Up.svg b/assets/images/SVG/Caret Up.svg index 299772878..6c1205fb5 100644 --- a/assets/images/SVG/Caret Up.svg +++ b/assets/images/SVG/Caret Up.svg @@ -1,6 +1,6 @@ - - + + diff --git a/assets/images/SVG/Currency.svg b/assets/images/SVG/Currency.svg deleted file mode 100644 index 57d1b3596..000000000 --- a/assets/images/SVG/Currency.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/images/SVG/Edit.svg b/assets/images/SVG/Edit.svg index 88b8398b2..b01c149c2 100644 --- a/assets/images/SVG/Edit.svg +++ b/assets/images/SVG/Edit.svg @@ -1,14 +1,14 @@ - - - - \ No newline at end of file + + + + + diff --git a/assets/images/SVG/Gear.svg b/assets/images/SVG/Gear.svg new file mode 100644 index 000000000..09e6c7b88 --- /dev/null +++ b/assets/images/SVG/Gear.svg @@ -0,0 +1,18 @@ + + + + + diff --git a/assets/images/SVG/Pen.svg b/assets/images/SVG/Pen.svg index bd36bd536..add1652b8 100644 --- a/assets/images/SVG/Pen.svg +++ b/assets/images/SVG/Pen.svg @@ -2,7 +2,7 @@ - diff --git a/assets/images/SVG/QR.svg b/assets/images/SVG/QR.svg index 51b1e27e5..159f27aa0 100644 --- a/assets/images/SVG/QR.svg +++ b/assets/images/SVG/QR.svg @@ -1,16 +1,16 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/images/SVG/Refresh.svg b/assets/images/SVG/Refresh.svg deleted file mode 100644 index 1c67b414a..000000000 --- a/assets/images/SVG/Refresh.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/assets/images/SVG/Share.svg b/assets/images/SVG/Share.svg index f759638b6..b23d4b61e 100644 --- a/assets/images/SVG/Share.svg +++ b/assets/images/SVG/Share.svg @@ -1,12 +1,12 @@ - - - - \ No newline at end of file + + + + + diff --git a/assets/images/SVG/Star.svg b/assets/images/SVG/Star.svg new file mode 100644 index 000000000..da02df26c --- /dev/null +++ b/assets/images/SVG/Star.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/views/Channels/Channel.tsx b/views/Channels/Channel.tsx index 19407e0b1..b9b5258d2 100644 --- a/views/Channels/Channel.tsx +++ b/views/Channels/Channel.tsx @@ -172,9 +172,11 @@ export default class ChannelView extends React.Component< const EditFees = () => ( navigation.navigate('SetFees', { channel })} - style={{ top: -5 }} > - + ); @@ -188,7 +190,10 @@ export default class ChannelView extends React.Component< }) } > - + ); diff --git a/views/ContactDetails.tsx b/views/ContactDetails.tsx index c26387dcd..4695674f9 100644 --- a/views/ContactDetails.tsx +++ b/views/ContactDetails.tsx @@ -8,7 +8,6 @@ import { ScrollView } from 'react-native'; import EncryptedStorage from 'react-native-encrypted-storage'; -import { Icon } from 'react-native-elements'; import Screen from '../components/Screen'; import LoadingIndicator from '../components/LoadingIndicator'; import Header from '../components/Header'; @@ -18,6 +17,7 @@ import BitcoinIcon from '../assets/images/SVG/BitcoinIcon.svg'; import KeySecurity from '../assets/images/SVG/Key Security.svg'; import VerifiedAccount from '../assets/images/SVG/Verified Account.svg'; import EditContact from '../assets/images/SVG/Pen.svg'; +import Star from '../assets/images/SVG/Star.svg'; import { themeColor } from '../utils/ThemeUtils'; import LinkingUtils from '../utils/LinkingUtils'; @@ -165,13 +165,14 @@ export default class ContactDetails extends React.Component< const { navigation } = this.props; const StarButton = () => ( - + + + ); const EditContactButton = () => ( - + ); return ( diff --git a/views/EditFee.tsx b/views/EditFee.tsx index b8afd140a..fdaebb424 100644 --- a/views/EditFee.tsx +++ b/views/EditFee.tsx @@ -21,7 +21,7 @@ import { themeColor } from '../utils/ThemeUtils'; import { localeString } from '../utils/LocaleUtils'; import MempoolSpace from '../assets/images/affiliates/Mempool.svg'; -import Refresh from '../assets/images/SVG/Refresh.svg'; +import Refresh from '../assets/images/SVG/Sync.svg'; import ErrorIcon from '../assets/images/SVG/ErrorIcon.svg'; import FeeStore from './../stores/FeeStore'; @@ -80,7 +80,12 @@ export default class EditFee extends React.Component< const ReloadButton = () => ( getOnchainFeesviaMempool()}> - + ); diff --git a/views/Invoice.tsx b/views/Invoice.tsx index ef89bd3ac..40cb747fd 100644 --- a/views/Invoice.tsx +++ b/views/Invoice.tsx @@ -2,7 +2,6 @@ import * as React from 'react'; import EncryptedStorage from 'react-native-encrypted-storage'; import { StyleSheet, ScrollView, View, TouchableOpacity } from 'react-native'; -import { Icon } from 'react-native-elements'; import Amount from '../components/Amount'; import Header from '../components/Header'; @@ -17,6 +16,7 @@ import { localeString } from '../utils/LocaleUtils'; import { themeColor } from '../utils/ThemeUtils'; import EditNotes from '../assets/images/SVG/Pen.svg'; +import QR from '../assets/images/SVG/QR.svg'; interface InvoiceProps { navigation: any; @@ -64,24 +64,25 @@ export default class InvoiceView extends React.Component { const noteKey = getRPreimage || payment_hash; const QRButton = () => ( - { - navigation.navigate('QR', { value: getPaymentRequest }); - }} - color={themeColor('text')} - underlayColor="transparent" - size={35} - /> + + navigation.navigate('QR', { value: getPaymentRequest }) + } + > + + ); const EditNotesButton = () => ( navigation.navigate('AddNotes', { getRPreimage: noteKey }) } - style={{ marginTop: -6, alignSelf: 'center', marginRight: 14 }} + style={{ marginRight: 15 }} > - + ); diff --git a/views/Payment.tsx b/views/Payment.tsx index d91e10d2d..e9ec1707a 100644 --- a/views/Payment.tsx +++ b/views/Payment.tsx @@ -93,7 +93,10 @@ export default class PaymentView extends React.Component { navigation.navigate('AddNotes', { payment_hash: noteKey }) } > - + ); diff --git a/views/PaymentRequest.tsx b/views/PaymentRequest.tsx index 8e5de1523..97ee66253 100644 --- a/views/PaymentRequest.tsx +++ b/views/PaymentRequest.tsx @@ -9,7 +9,6 @@ import { TouchableOpacity } from 'react-native'; import { inject, observer } from 'mobx-react'; -import { Icon } from 'react-native-elements'; import Amount from '../components/Amount'; import AmountInput from '../components/AmountInput'; @@ -43,6 +42,7 @@ import { Row } from '../components/layout/Row'; import CaretDown from '../assets/images/SVG/Caret Down.svg'; import CaretRight from '../assets/images/SVG/Caret Right.svg'; +import QR from '../assets/images/SVG/QR.svg'; import Conversion from '../components/Conversion'; interface InvoiceProps { @@ -355,15 +355,13 @@ export default class PaymentRequest extends React.Component< const noBalance = this.props.BalanceStore.lightningBalance === 0; const QRButton = () => ( - { - navigation.navigate('QR', { value: paymentRequest }); - }} - color={themeColor('text')} - underlayColor="transparent" - size={35} - /> + + navigation.navigate('QR', { value: paymentRequest }) + } + > + + ); return ( diff --git a/views/Receive.tsx b/views/Receive.tsx index 46c587d6b..afb92ae2f 100644 --- a/views/Receive.tsx +++ b/views/Receive.tsx @@ -79,6 +79,7 @@ import UnifiedSvg from '../assets/images/SVG/DynamicSVG/UnifiedSvg'; import LightningSvg from '../assets/images/SVG/DynamicSVG/LightningSvg'; import OnChainSvg from '../assets/images/SVG/DynamicSVG/OnChainSvg'; import AddressSvg from '../assets/images/SVG/DynamicSVG/AddressSvg'; +import Gear from '../assets/images/SVG/Gear.svg'; interface ReceiveProps { exitSetup: any; @@ -951,13 +952,12 @@ export default class Receive extends React.Component< ); const SettingsButton = () => ( - this.refs.modal.open()} - color={themeColor('text')} - underlayColor="transparent" - size={30} - /> + this.refs.modal.open()}> + + ); const ADDRESS_TYPES = BackendUtils.supportsTaproot() diff --git a/views/Settings/AddContact.tsx b/views/Settings/AddContact.tsx index cbb60a3e8..23ad8e589 100644 --- a/views/Settings/AddContact.tsx +++ b/views/Settings/AddContact.tsx @@ -29,6 +29,8 @@ import { localeString } from '../../utils/LocaleUtils'; import Screen from '../../components/Screen'; import Header from '../../components/Header'; +import Star from '../../assets/images/SVG/Star.svg'; + interface AddContactProps { navigation: any; } @@ -367,13 +369,14 @@ export default class AddContact extends React.Component< ); const StarButton = ({ isFavourite, onPress }) => ( - + + + ); const isEdit = !!this.props.navigation.getParam('isEdit', false); const prefillContact = this.props.navigation.getParam( diff --git a/views/Settings/InvoicesSettings.tsx b/views/Settings/InvoicesSettings.tsx index b9a38afc0..51268713f 100644 --- a/views/Settings/InvoicesSettings.tsx +++ b/views/Settings/InvoicesSettings.tsx @@ -1,6 +1,5 @@ import * as React from 'react'; import { StyleSheet, Text, TouchableOpacity, View } from 'react-native'; -import { Icon } from 'react-native-elements'; import { inject, observer } from 'mobx-react'; import _map from 'lodash/map'; @@ -16,6 +15,8 @@ import BackendUtils from '../../utils/BackendUtils'; import { localeString } from '../../utils/LocaleUtils'; import { themeColor } from '../../utils/ThemeUtils'; +import Gear from '../../assets/images/SVG/Gear.svg'; + interface InvoicesSettingsProps { navigation: any; SettingsStore: SettingsStore; @@ -122,13 +123,12 @@ export default class InvoicesSettings extends React.Component< ]; const SettingsButton = () => ( - this.refs.modal.open()} - color={themeColor('text')} - underlayColor="transparent" - size={30} - /> + this.refs.modal.open()}> + + ); return ( diff --git a/views/Settings/LightningAddress/index.tsx b/views/Settings/LightningAddress/index.tsx index 9f270e184..8f028ec05 100644 --- a/views/Settings/LightningAddress/index.tsx +++ b/views/Settings/LightningAddress/index.tsx @@ -35,6 +35,9 @@ import SettingsStore, { import { localeString } from '../../../utils/LocaleUtils'; import { themeColor } from '../../../utils/ThemeUtils'; +import QR from '../../../assets/images/SVG/QR.svg'; +import Gear from '../../../assets/images/SVG/Gear.svg'; + interface LightningAddressProps { navigation: any; ChannelsStore: ChannelsStore; @@ -189,17 +192,16 @@ export default class LightningAddress extends React.Component< ); const SettingsButton = () => ( - - { - navigation.navigate('LightningAddressSettings'); - }} - color={themeColor('text')} - underlayColor="transparent" - size={35} + { + navigation.navigate('LightningAddressSettings'); + }} + > + - + ); const QRButton = () => ( @@ -212,14 +214,9 @@ export default class LightningAddress extends React.Component< logo: require('../../../assets/images/pay-z-black.png') }) } - style={{ marginTop: 5 }} + style={{ marginTop: 10 }} > - + ); diff --git a/views/Settings/Settings.tsx b/views/Settings/Settings.tsx index 81cc7e676..0b3216c68 100644 --- a/views/Settings/Settings.tsx +++ b/views/Settings/Settings.tsx @@ -16,7 +16,7 @@ import ContactIcon from '../../assets/images/SVG/PeersContact.svg'; import PrivacyIcon from '../../assets/images/SVG/Eye On.svg'; import SecurityIcon from '../../assets/images/SVG/Lock.svg'; import SignIcon from '../../assets/images/SVG/Pen.svg'; -import CurrencyIcon from '../../assets/images/SVG/Currency.svg'; +import CurrencyIcon from '../../assets/images/SVG/Bitcoin.svg'; import BrushIcon from '../../assets/images/SVG/Brush.svg'; import LanguageIcon from '../../assets/images/SVG/Globe.svg'; import NodeOn from '../../assets/images/SVG/Node On.svg'; @@ -709,7 +709,13 @@ export default class Settings extends React.Component< } > - + { const EditNotesButton = () => ( navigation.navigate('AddNotes', { txid: tx })} - style={{ marginTop: -6 }} > - + );