mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-01-19 05:45:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflict

Browse Source
This commit is contained in:
Overtorment 2018-09-22 12:28:34 +01:00
commit 2d050d34a5
14 changed files with 34 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
App.test.js
View File

@ -29,8 +29,7 @@ jest.mock('ScrollView', () => {
const RealComponent = require.requireActual('ScrollView');
const React = require('React');
class ScrollView extends React.Component {
scrollTo() {
}
scrollTo() {}
render() {
return React.createElement('ScrollView', this.props, this.props.children);

42
BlueComponents.js
View File

@ -2,7 +2,7 @@
import React, { Component } from 'react';
import Ionicons from 'react-native-vector-icons/Ionicons';
import { LinearGradient, Constants } from 'expo';
import { Icon, Button, FormLabel, FormInput, Card, Text, Header, List, ListItem } from 'react-native-elements';
import { Icon, Button, FormLabel, FormInput, Text, Header, List, ListItem } from 'react-native-elements';
import { TouchableOpacity, ActivityIndicator, View, StyleSheet, Dimensions, Image, SafeAreaView } from 'react-native';
import { WatchOnlyWallet, LegacyWallet } from './class';
import Carousel from 'react-native-snap-carousel';
@ -160,27 +160,7 @@ export class SafeBlueArea extends Component {
export class BlueCard extends Component {
render() {
return (
<Card
{...this.props}
titleStyle={{ color: BlueApp.settings.foregroundColor }}
containerStyle={{
backgroundColor: 'transparent',
borderColor: 'transparent',
paddingTop: 0,
marginTop: 0,
flex: 1,
}}
dividerStyle={{
backgroundColor: 'transparent',
borderColor: 'transparent',
}}
wrapperStyle={{
backgroundColor: 'transparent',
flex: 1,
}}
/>
);
return <View {...this.props} style={{ padding: 20 }} />;
}
}
@ -320,7 +300,7 @@ export class BlueHeader extends Component {
export class BlueHeaderDefaultSub extends Component {
render() {
return (
<SafeAreaView style={{ backgroundColor: "#FFFFFF" }}>
<SafeAreaView style={{ backgroundColor: '#FFFFFF' }}>
<Header
{...this.props}
backgroundColor="#FFFFFF"
@ -366,7 +346,7 @@ export class BlueHeaderDefaultSub extends Component {
export class BlueHeaderDefaultMain extends Component {
render() {
return (
<SafeAreaView style={{ backgroundColor: "#FFFFFF" }}>
<SafeAreaView style={{ backgroundColor: '#FFFFFF' }}>
<View style={{ height: 120 }}>
<TouchableOpacity
onPress={() => {
@ -467,7 +447,7 @@ export class BlueList extends Component {
backgroundColor: BlueApp.settings.brandingColor,
borderTopColor: 'transparent',
borderTopWidth: 0,
flex: 1
flex: 1,
}}
/>
);
@ -598,7 +578,7 @@ export class BlueRefreshIcon extends Component {
export class BlueTransactionIncommingIcon extends Component {
render() {
return (
<View {...this.props} >
<View {...this.props}>
<View style={stylesBlueIcon.boxIncomming}>
<View style={stylesBlueIcon.ballIncomming}>
<Icon {...this.props} name="arrow-down" size={16} type="font-awesome" color="#37c0a1" iconStyle={{ left: 0, top: 8 }} />
@ -612,7 +592,7 @@ export class BlueTransactionIncommingIcon extends Component {
export class BlueTransactionPendingIcon extends Component {
render() {
return (
<View {...this.props} >
<View {...this.props}>
<View style={stylesBlueIcon.box}>
<View style={stylesBlueIcon.ball}>
<Icon
@ -633,7 +613,7 @@ export class BlueTransactionPendingIcon extends Component {
export class BlueTransactionOnchainIcon extends Component {
render() {
return (
<View {...this.props} >
<View {...this.props}>
<View style={stylesBlueIcon.boxIncomming}>
<View style={stylesBlueIcon.ballIncomming}>
<Icon
@ -654,7 +634,7 @@ export class BlueTransactionOnchainIcon extends Component {
export class BlueTransactionOffchainIcon extends Component {
render() {
return (
<View {...this.props} >
<View {...this.props}>
<View style={stylesBlueIcon.boxIncomming}>
<View style={stylesBlueIcon.ballOutgoing}>
<Icon
@ -675,7 +655,7 @@ export class BlueTransactionOffchainIcon extends Component {
export class BlueTransactionOffchainIncomingIcon extends Component {
render() {
return (
<View {...this.props} >
<View {...this.props}>
<View style={stylesBlueIcon.boxIncomming}>
<View style={stylesBlueIcon.ballIncomming}>
<Icon
@ -696,7 +676,7 @@ export class BlueTransactionOffchainIncomingIcon extends Component {
export class BlueTransactionOutgoingIcon extends Component {
render() {
return (
<View {...this.props} >
<View {...this.props}>
<View style={stylesBlueIcon.boxIncomming}>
<View style={stylesBlueIcon.ballOutgoing}>
<Icon {...this.props} name="arrow-down" size={16} type="font-awesome" color="#d0021b" iconStyle={{ left: 0, top: 8 }} />

3
MainBottomTabs.js
View File

@ -6,9 +6,6 @@ import send from './screen/send';
import settings from './screen/settings';
import receive from './screen/receive';
/** @type {AppStorage} */
let BlueApp = require('./BlueApp');
const Tabs = createStackNavigator(
{
Wallets: {

2
app.json
View File

@ -7,7 +7,7 @@
"ios"
],
"ios": {
"buildNumber": "68",
"buildNumber": "69",
"supportsTablet": true,
"isRemoteJSEnabled": false,
"bundleIdentifier": "io.bluewallet.bluewallet",

5
screen/lnd/manageFunds.js
View File

@ -14,7 +14,9 @@ let data = [];
export default class ManageFunds extends Component {
static navigationOptions = {
tabBarVisible: false,
header: ({ navigation }) => {
return <BlueHeaderDefaultSub leftText={loc.lnd.title} onClose={() => navigation.goBack(null)} />;
},
};
constructor(props) {
@ -66,7 +68,6 @@ export default class ManageFunds extends Component {
return (
<SafeBlueArea forceInset={{ horizontal: 'always' }} style={{ flex: 1 }}>
<BlueSpacingVariable />
<BlueHeaderDefaultSub leftText={loc.lnd.title} onClose={() => this.props.navigation.goBack()} />
<BlueCard>
{(() => {

12
screen/receive/details.js
View File

@ -1,15 +1,7 @@
import React, { Component } from 'react';
import { Dimensions, View } from 'react-native';
import QRCode from 'react-native-qrcode';
import {
BlueLoading,
BlueFormInputAddress,
SafeBlueArea,
BlueCard,
BlueHeaderDefaultSub,
BlueSpacingVariable,
is,
} from '../../BlueComponents';
import { BlueLoading, BlueFormInputAddress, SafeBlueArea, BlueCard, BlueHeaderDefaultSub, is } from '../../BlueComponents';
import PropTypes from 'prop-types';
/** @type {AppStorage} */
let BlueApp = require('../../BlueApp');
@ -18,7 +10,6 @@ let loc = require('../../loc');
const { width } = Dimensions.get('window');
export default class ReceiveDetails extends Component {
static navigationOptions = {
header: ({ navigation }) => {
return <BlueHeaderDefaultSub leftText={loc.receive.list.header} onClose={() => navigation.goBack(null)} />;
@ -84,7 +75,6 @@ export default class ReceiveDetails extends Component {
return (
<SafeBlueArea style={{ flex: 1 }}>
<BlueSpacingVariable />
<BlueCard
containerStyle={{
alignItems: 'center',

2
screen/receive/list.js
View File

@ -1,6 +1,5 @@
import React, { Component } from 'react';
import { FlatList, StyleSheet } from 'react-native';
import Ionicons from 'react-native-vector-icons/Ionicons';
import { BlueLoading, SafeBlueArea, BlueCard, BlueListItem, BlueHeader } from '../../BlueComponents';
import PropTypes from 'prop-types';
/** @type {AppStorage} */
@ -9,7 +8,6 @@ let EV = require('../../events');
let loc = require('../../loc');
export default class ReceiveList extends Component {
constructor(props) {
super(props);
this.state = {

5
screen/send/create.js
View File

@ -19,7 +19,9 @@ let loc = require('../../loc');
export default class SendCreate extends Component {
static navigationOptions = {
tabBarVisible: false,
header: ({ navigation }) => {
return <BlueHeaderDefaultSub leftText={loc.send.create.title} onClose={() => navigation.goBack(null)} />;
},
};
constructor(props) {
@ -153,7 +155,6 @@ export default class SendCreate extends Component {
return (
<SafeBlueArea style={{ flex: 1, paddingTop: 20 }}>
<BlueSpacingVariable />
<BlueHeaderDefaultSub leftText={loc.send.create.title} onClose={() => this.props.navigation.goBack()} />
<BlueCard style={{ alignItems: 'center', flex: 1 }}>
<BlueText>{loc.send.create.this_is_hex}</BlueText>

18
screen/send/details.js
View File

@ -3,11 +3,9 @@ import { ActivityIndicator, View } from 'react-native';
import { Text, FormValidationMessage } from 'react-native-elements';
import {
BlueSpacing20,
BlueSpacingVariable,
BlueHeaderDefaultSub,
BlueButton,
SafeBlueArea,
BlueCard,
BlueText,
BlueFormInput,
BlueFormInputAddress,
@ -23,6 +21,11 @@ let loc = require('../../loc');
const btcAddressRx = /^[a-zA-Z0-9]{26,35}$/;
export default class SendDetails extends Component {
static navigationOptions = {
header: ({ navigation }) => {
return <BlueHeaderDefaultSub leftText={loc.send.details.title} onClose={() => navigation.goBack(null)} />;
},
};
constructor(props) {
super(props);
@ -180,11 +183,8 @@ export default class SendDetails extends Component {
}
return (
<SafeBlueArea style={{ flex: 1, paddingTop: 20 }}>
<BlueSpacingVariable />
<BlueHeaderDefaultSub leftText={loc.send.details.title} onClose={() => this.props.navigation.goBack()} />
<BlueCard style={{ alignItems: 'center', flex: 1 }}>
<SafeBlueArea style={{ flex: 1 }}>
<View>
<BlueFormInputAddress
onChangeText={text => this.setState({ address: text })}
placeholder={loc.send.details.receiver_placeholder}
@ -212,11 +212,11 @@ export default class SendDetails extends Component {
/>
<BlueSpacing20 />
<BlueText>
<BlueText style={{ paddingLeft: 20 }}>
{loc.send.details.remaining_balance}:{' '}
{this.recalculateAvailableBalance(this.state.fromWallet.getBalance(), this.state.amount, this.state.fee)} BTC
</BlueText>
</BlueCard>
</View>
<FormValidationMessage>{this.state.errorMessage}</FormValidationMessage>

5
screen/transactions/details.js
View File

@ -48,7 +48,9 @@ function formatTime(time) {
export default class TransactionsDetails extends Component {
static navigationOptions = {
tabBarVisible: false,
header: ({ navigation }) => {
return <BlueHeaderDefaultSub leftText={loc.transactions.details.title} onClose={() => navigation.goBack(null)} />;
},
};
constructor(props) {
@ -99,7 +101,6 @@ export default class TransactionsDetails extends Component {
return <BlueSpacing />;
}
})()}
<BlueHeaderDefaultSub leftText={loc.transactions.details.title} onClose={() => this.props.navigation.goBack()} />
<BlueCard>
{(() => {

2
screen/transactions/list.js
View File

@ -87,7 +87,7 @@ export default class TransactionsList extends Component {
_keyExtractor = (item, index) => item.hash;
render() {
console.warn(this.state.dataSource)
console.warn(this.state.dataSource);
const { navigate } = this.props.navigation;
if (this.state.isLoading) {

2
screen/wallets/add.js
View File

@ -10,7 +10,6 @@ import {
BlueButtonLink,
BlueFormLabel,
BlueFormInput,
BlueSpacingVariable,
BlueButton,
SafeBlueArea,
BlueCard,
@ -74,7 +73,6 @@ export default class WalletsAdd extends Component {
return (
<SafeBlueArea forceInset={{ horizontal: 'always' }} style={{ flex: 1, paddingTop: 40 }}>
<BlueSpacingVariable />
<BlueCard>
<BlueFormLabel>{loc.wallets.add.wallet_name}</BlueFormLabel>
<BlueFormInput

2
screen/wallets/details.js
View File

@ -1,7 +1,6 @@
import React, { Component } from 'react';
import { ActivityIndicator, View } from 'react-native';
import {
BlueSpacingVariable,
BlueFormInput,
BlueButton,
SafeBlueArea,
@ -79,7 +78,6 @@ export default class WalletDetails extends Component {
return (
<SafeBlueArea style={{ flex: 1 }}>
<BlueSpacingVariable />
<BlueCard style={{ alignItems: 'center', flex: 1 }}>
{(() => {
if (this.state.wallet.getAddress()) {

1
screen/wallets/export.js
View File

@ -16,7 +16,6 @@ if (aspectRatio > 1.6) {
}
export default class WalletExport extends Component {
static navigationOptions = {
header: ({ navigation }) => {
return <BlueHeaderDefaultSub leftText={loc.wallets.export.title} onClose={() => navigation.goBack(null)} />;