mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-22 23:08:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed transaction layout

Browse source
This commit is contained in:
Marcos Rodriguez Vélez 2019-01-24 14:48:40 -05:00
parent b57e0718ba
commit 32f798fd21
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
BlueComponents.js
View file

@ -269,13 +269,12 @@ export class BlueText extends Component {
render() {
return (
<Text
style={Object.assign(
{
color: BlueApp.settings.foregroundColor,
},
style={{
color: BlueApp.settings.foregroundColor,
// eslint-disable-next-line
this.props.style,
)}
...this.props.style,
}}
{...this.props}
/>
);

16
screen/wallets/transactions.js
View file

@ -366,27 +366,26 @@ export default class WalletTransactions extends Component {
{(() => {
if (this.state.showManageFundsSmallButton) {
return (
<React.Fragment>
<View style={{ flex: 1, justifyContent: 'space-between', minHeight: 40, alignContent: 'center', flexDirection: 'row' }}>
<TouchableOpacity
style={{ alignSelf: 'flex-start', left: 10, top: 15, flexDirection: 'row' }}
style={{ left: 10, flexDirection: 'row', flex: 1, alignItems: 'center' }}
onPress={() => {
console.log('navigating to LappBrowser');
navigate('LappBrowser', { fromSecret: this.state.wallet.getSecret(), fromWallet: this.state.wallet });
}}
>
<BlueText style={{ fontWeight: '600', fontSize: 16 }}>{'marketplace'}</BlueText>
<BlueText style={{ fontWeight: '600', fontSize: 16 }}>marketplace</BlueText>
<Icon
style={{ position: 'relative' }}
name="shopping-cart"
type="font-awesome"
size={14}
color={BlueApp.settings.foregroundColor}
iconStyle={{ left: 5 }}
iconStyle={{ left: 5, top: 2 }}
/>
</TouchableOpacity>
<TouchableOpacity
style={{ alignSelf: 'flex-end', right: 10, top: -5, flexDirection: 'row' }}
style={{ marginRight: 10, flexDirection: 'row', alignItems: 'center' }}
onPress={() => {
console.log('navigating to', this.state.wallet.getLabel());
navigate('ManageFunds', { fromWallet: this.state.wallet });
@ -394,15 +393,14 @@ export default class WalletTransactions extends Component {
>
<BlueText style={{ fontWeight: '600', fontSize: 16 }}>{loc.lnd.title}</BlueText>
<Icon
style={{ position: 'relative' }}
name="link"
type="font-awesome"
size={14}
color={BlueApp.settings.foregroundColor}
iconStyle={{ left: 5, transform: [{ rotate: '90deg' }] }}
iconStyle={{ left: 5, top: 2, transform: [{ rotate: '90deg' }] }}
/>
</TouchableOpacity>
</React.Fragment>
</View>
);
}
})()}