Browse Source

ADD: New TX status screen

keystore
Marcos Rodriguez 5 years ago
parent
commit
8eb0b4269e
  1. 4
      BlueComponents.js
  2. 4
      MainBottomTabs.js
  3. 8
      screen/send/details.js
  4. 2
      screen/transactions/RBF-create.js
  5. 165
      screen/transactions/details.js
  6. 369
      screen/transactions/transactionStatus.js

4
BlueComponents.js

@ -1472,7 +1472,7 @@ export class BlueTransactionListItem extends Component {
onPress = () => {
if (this.props.item.hash) {
NavigationService.navigate('TransactionDetails', { hash: this.props.item.hash });
NavigationService.navigate('TransactionStatus', { hash: this.props.item.hash });
} else if (
this.props.item.type === 'user_invoice' ||
this.props.item.type === 'payment_request' ||
@ -1663,7 +1663,7 @@ export class BlueListTransactionItem extends Component {
onPress = () => {
if (this.props.item.hash) {
NavigationService.navigate('TransactionDetails', { hash: this.props.item.hash });
NavigationService.navigate('TransactionStatus', { hash: this.props.item.hash });
} else if (
this.props.item.type === 'user_invoice' ||
this.props.item.type === 'payment_request' ||

4
MainBottomTabs.js

@ -24,6 +24,7 @@ import ReorderWallets from './screen/wallets/reorderWallets';
import SelectWallet from './screen/wallets/selectWallet';
import details from './screen/transactions/details';
import TransactionStatus from './screen/transactions/transactionStatus';
import rbf from './screen/transactions/RBF';
import createrbf from './screen/transactions/RBF-create';
import cpfp from './screen/transactions/CPFP';
@ -61,6 +62,9 @@ const WalletsStackNavigator = createStackNavigator(
WalletTransactions: {
screen: WalletTransactions,
},
TransactionStatus: {
screen: TransactionStatus,
},
TransactionDetails: {
screen: details,
},

8
screen/send/details.js

@ -598,14 +598,12 @@ export default class SendDetails extends Component {
this.props.navigation.navigate('SelectWallet', { onWalletSelect: this.onWalletSelect, chainType: Chain.ONCHAIN })
}
>
<Text style={{ color: '#9aa0aa', fontSize: 14, marginRight: 8 }}>
{loc.wallets.select_wallet.toLowerCase()}
</Text>
<Text style={{ color: '#9aa0aa', fontSize: 14, marginRight: 8 }}>{loc.wallets.select_wallet.toLowerCase()}</Text>
<Icon name="angle-right" size={18} type="font-awesome" color="#9aa0aa" />
</TouchableOpacity>
)}
<View style={{ flexDirection: 'row', alignItems: 'center', marginVertical: 4 }}>
<TouchableOpacity
<TouchableOpacity
style={{ flexDirection: 'row', alignItems: 'center' }}
onPress={() =>
this.props.navigation.navigate('SelectWallet', { onWalletSelect: this.onWalletSelect, chainType: Chain.ONCHAIN })
@ -618,7 +616,7 @@ export default class SendDetails extends Component {
<Text style={{ color: '#0c2550', fontSize: 11, fontWeight: '600', textAlignVertical: 'bottom', marginTop: 2 }}>
{BitcoinUnit.BTC}
</Text>
</TouchableOpacity>
</TouchableOpacity>
</View>
</View>
);

2
screen/transactions/RBF-create.js

@ -164,7 +164,7 @@ export default class SendCreate extends Component {
this.setState({ isLoading: false });
} else {
alert(JSON.stringify(result.result || result.txid));
this.props.navigation.navigate('TransactionDetails');
this.props.navigation.navigate('TransactionStatus');
}
});
}

165
screen/transactions/details.js

@ -1,7 +1,6 @@
import React, { Component } from 'react';
import { View, ActivityIndicator, ScrollView, TouchableOpacity, Linking } from 'react-native';
import { View, ScrollView, TouchableOpacity, Linking } from 'react-native';
import {
BlueButton,
SafeBlueArea,
BlueCard,
BlueText,
@ -12,18 +11,11 @@ import {
BlueNavigationStyle,
} from '../../BlueComponents';
import PropTypes from 'prop-types';
import { HDSegwitBech32Transaction, HDSegwitBech32Wallet } from '../../class';
/** @type {AppStorage} */
let BlueApp = require('../../BlueApp');
let loc = require('../../loc');
const dayjs = require('dayjs');
const buttonStatus = Object.freeze({
possible: 1,
unknown: 2,
notPossible: 3,
});
function onlyUnique(value, index, self) {
return self.indexOf(value) === index;
}
@ -77,9 +69,6 @@ export default class TransactionsDetails extends Component {
from,
to,
wallet,
isCPFPpossible: buttonStatus.unknown,
isRBFBumpFeePossible: buttonStatus.unknown,
isRBFCancelPossible: buttonStatus.unknown,
};
}
@ -88,62 +77,6 @@ export default class TransactionsDetails extends Component {
this.setState({
isLoading: false,
});
try {
await this.checkPossibilityOfCPFP();
await this.checkPossibilityOfRBFBumpFee();
await this.checkPossibilityOfRBFCancel();
} catch (_) {
this.setState({
isCPFPpossible: buttonStatus.notPossible,
isRBFBumpFeePossible: buttonStatus.notPossible,
isRBFCancelPossible: buttonStatus.notPossible,
});
}
}
async checkPossibilityOfCPFP() {
if (this.state.wallet.type !== HDSegwitBech32Wallet.type) {
return this.setState({ isCPFPpossible: buttonStatus.notPossible });
}
let tx = new HDSegwitBech32Transaction(null, this.state.tx.hash, this.state.wallet);
if ((await tx.isToUsTransaction()) && (await tx.getRemoteConfirmationsNum()) === 0) {
return this.setState({ isCPFPpossible: buttonStatus.possible });
} else {
return this.setState({ isCPFPpossible: buttonStatus.notPossible });
}
}
async checkPossibilityOfRBFBumpFee() {
if (this.state.wallet.type !== HDSegwitBech32Wallet.type) {
return this.setState({ isRBFBumpFeePossible: buttonStatus.notPossible });
}
let tx = new HDSegwitBech32Transaction(null, this.state.tx.hash, this.state.wallet);
if ((await tx.isOurTransaction()) && (await tx.getRemoteConfirmationsNum()) === 0 && (await tx.isSequenceReplaceable())) {
return this.setState({ isRBFBumpFeePossible: buttonStatus.possible });
} else {
return this.setState({ isRBFBumpFeePossible: buttonStatus.notPossible });
}
}
async checkPossibilityOfRBFCancel() {
if (this.state.wallet.type !== HDSegwitBech32Wallet.type) {
return this.setState({ isRBFCancelPossible: buttonStatus.notPossible });
}
let tx = new HDSegwitBech32Transaction(null, this.state.tx.hash, this.state.wallet);
if (
(await tx.isOurTransaction()) &&
(await tx.getRemoteConfirmationsNum()) === 0 &&
(await tx.isSequenceReplaceable()) &&
(await tx.canCancelTx())
) {
return this.setState({ isRBFCancelPossible: buttonStatus.possible });
} else {
return this.setState({ isRBFCancelPossible: buttonStatus.notPossible });
}
}
render() {
@ -156,102 +89,6 @@ export default class TransactionsDetails extends Component {
<BlueHeaderDefaultSub leftText={loc.transactions.details.title} rightComponent={null} />
<ScrollView style={{ flex: 1 }}>
<BlueCard>
{(() => {
if (this.state.tx.confirmations === 0 && this.state.wallet && this.state.wallet.allowRBF()) {
return (
<React.Fragment>
<BlueButton
onPress={() =>
this.props.navigation.navigate('RBF', {
txid: this.state.tx.hash,
})
}
title="Replace-By-Fee (RBF)"
/>
<BlueSpacing20 />
</React.Fragment>
);
}
})()}
{(() => {
if (this.state.isCPFPpossible === buttonStatus.unknown) {
return (
<React.Fragment>
<ActivityIndicator />
<BlueSpacing20 />
</React.Fragment>
);
} else if (this.state.isCPFPpossible === buttonStatus.possible) {
return (
<React.Fragment>
<BlueButton
onPress={() =>
this.props.navigation.navigate('CPFP', {
txid: this.state.tx.hash,
wallet: this.state.wallet,
})
}
title="Bump fee (CPFP)"
/>
<BlueSpacing20 />
</React.Fragment>
);
}
})()}
{(() => {
if (this.state.isRBFBumpFeePossible === buttonStatus.unknown) {
return (
<React.Fragment>
<ActivityIndicator />
<BlueSpacing20 />
</React.Fragment>
);
} else if (this.state.isRBFBumpFeePossible === buttonStatus.possible) {
return (
<React.Fragment>
<BlueButton
onPress={() =>
this.props.navigation.navigate('RBFBumpFee', {
txid: this.state.tx.hash,
wallet: this.state.wallet,
})
}
title="Bump fee (RBF)"
/>
<BlueSpacing20 />
</React.Fragment>
);
}
})()}
{(() => {
if (this.state.isRBFCancelPossible === buttonStatus.unknown) {
return (
<React.Fragment>
<ActivityIndicator />
<BlueSpacing20 />
</React.Fragment>
);
} else if (this.state.isRBFCancelPossible === buttonStatus.possible) {
return (
<React.Fragment>
<BlueButton
onPress={() =>
this.props.navigation.navigate('RBFCancel', {
txid: this.state.tx.hash,
wallet: this.state.wallet,
})
}
title="Cancel this transaction (RBF)"
/>
<BlueSpacing20 />
</React.Fragment>
);
}
})()}
{(() => {
if (BlueApp.tx_metadata[this.state.tx.hash]) {
if (BlueApp.tx_metadata[this.state.tx.hash]['memo']) {

369
screen/transactions/transactionStatus.js

@ -0,0 +1,369 @@
import React, { Component } from 'react';
import { View, ActivityIndicator, Text, TouchableOpacity } from 'react-native';
import {
BlueButton,
SafeBlueArea,
BlueTransactionOutgoingIcon,
BlueTransactionPendingIcon,
BlueTransactionIncomingIcon,
BlueCard,
BlueText,
BlueLoading,
BlueSpacing20,
BlueNavigationStyle,
} from '../../BlueComponents';
import PropTypes from 'prop-types';
import { HDSegwitBech32Transaction, HDSegwitBech32Wallet } from '../../class';
import { BitcoinUnit } from '../../models/bitcoinUnits';
import { Icon } from 'react-native-elements';
/** @type {AppStorage} */
let BlueApp = require('../../BlueApp');
let loc = require('../../loc');
const buttonStatus = Object.freeze({
possible: 1,
unknown: 2,
notPossible: 3,
});
export default class TransactionsStatus extends Component {
static navigationOptions = () => ({
...BlueNavigationStyle(),
});
constructor(props) {
super(props);
let hash = props.navigation.state.params.hash;
let foundTx = {};
let from = [];
let to = [];
for (let tx of BlueApp.getTransactions()) {
if (tx.hash === hash) {
foundTx = tx;
for (let input of foundTx.inputs) {
from = from.concat(input.addresses);
}
for (let output of foundTx.outputs) {
if (output.addresses) to = to.concat(output.addresses);
if (output.scriptPubKey && output.scriptPubKey.addresses) to = to.concat(output.scriptPubKey.addresses);
}
}
}
let wallet = false;
for (let w of BlueApp.getWallets()) {
for (let t of w.getTransactions()) {
if (t.hash === hash) {
console.log('tx', hash, 'belongs to', w.getLabel());
wallet = w;
}
}
}
this.state = {
isLoading: true,
tx: foundTx,
from,
to,
wallet,
isCPFPpossible: buttonStatus.unknown,
isRBFBumpFeePossible: buttonStatus.unknown,
isRBFCancelPossible: buttonStatus.unknown,
};
}
async componentDidMount() {
console.log('transactions/details - componentDidMount');
this.setState({
isLoading: false,
});
try {
await this.checkPossibilityOfCPFP();
await this.checkPossibilityOfRBFBumpFee();
await this.checkPossibilityOfRBFCancel();
} catch (_) {
this.setState({
isCPFPpossible: buttonStatus.notPossible,
isRBFBumpFeePossible: buttonStatus.notPossible,
isRBFCancelPossible: buttonStatus.notPossible,
});
}
}
async checkPossibilityOfCPFP() {
if (this.state.wallet.type !== HDSegwitBech32Wallet.type) {
return this.setState({ isCPFPpossible: buttonStatus.notPossible });
}
let tx = new HDSegwitBech32Transaction(null, this.state.tx.hash, this.state.wallet);
if ((await tx.isToUsTransaction()) && (await tx.getRemoteConfirmationsNum()) === 0) {
return this.setState({ isCPFPpossible: buttonStatus.possible });
} else {
return this.setState({ isCPFPpossible: buttonStatus.notPossible });
}
}
async checkPossibilityOfRBFBumpFee() {
if (this.state.wallet.type !== HDSegwitBech32Wallet.type) {
return this.setState({ isRBFBumpFeePossible: buttonStatus.notPossible });
}
let tx = new HDSegwitBech32Transaction(null, this.state.tx.hash, this.state.wallet);
if ((await tx.isOurTransaction()) && (await tx.getRemoteConfirmationsNum()) === 0 && (await tx.isSequenceReplaceable())) {
return this.setState({ isRBFBumpFeePossible: buttonStatus.possible });
} else {
return this.setState({ isRBFBumpFeePossible: buttonStatus.notPossible });
}
}
async checkPossibilityOfRBFCancel() {
if (this.state.wallet.type !== HDSegwitBech32Wallet.type) {
return this.setState({ isRBFCancelPossible: buttonStatus.notPossible });
}
let tx = new HDSegwitBech32Transaction(null, this.state.tx.hash, this.state.wallet);
if (
(await tx.isOurTransaction()) &&
(await tx.getRemoteConfirmationsNum()) === 0 &&
(await tx.isSequenceReplaceable()) &&
(await tx.canCancelTx())
) {
return this.setState({ isRBFCancelPossible: buttonStatus.possible });
} else {
return this.setState({ isRBFCancelPossible: buttonStatus.notPossible });
}
}
render() {
if (this.state.isLoading || !this.state.hasOwnProperty('tx')) {
return <BlueLoading />;
}
return (
<SafeBlueArea forceInset={{ horizontal: 'always' }} style={{ flex: 1 }}>
<View style={{ flex: 1, justifyContent: 'space-between' }}>
<BlueCard>
<View style={{ alignItems: 'center' }}>
<Text style={{ color: '#2f5fb3', fontSize: 36, fontWeight: '600' }}>
{loc.formatBalanceWithoutSuffix(this.state.tx.value, this.state.wallet.preferredBalanceUnit, true)}{' '}
{this.state.wallet.preferredBalanceUnit !== BitcoinUnit.LOCAL_CURRENCY && (
<Text style={{ color: '#2f5fb3', fontSize: 16, fontWeight: '600' }}>{this.state.wallet.preferredBalanceUnit}</Text>
)}
</Text>
</View>
{(() => {
if (BlueApp.tx_metadata[this.state.tx.hash]) {
if (BlueApp.tx_metadata[this.state.tx.hash]['memo']) {
return (
<View style={{ alignItems: 'center', marginVertical: 8 }}>
<Text style={{ color: '#9aa0aa', fontSize: 14 }}>{BlueApp.tx_metadata[this.state.tx.hash]['memo']}</Text>
<BlueSpacing20 />
</View>
);
}
}
})()}
<View
style={{
backgroundColor: '#ccddf9',
width: 120,
height: 120,
borderRadius: 60,
alignSelf: 'center',
justifyContent: 'center',
marginTop: 43,
marginBottom: 53,
}}
>
<View>
<Icon name="check" size={50} type="font-awesome" color="#0f5cc0" />
</View>
<View
style={{
marginBottom: -40,
minWidth: 30,
minHeight: 30,
alignItems: 'center',
justifyContent: 'center',
alignSelf: 'flex-end',
borderRadius: 15,
}}
>
{(() => {
if (!this.state.tx.confirmations) {
return (
<View style={{ width: 25 }}>
<BlueTransactionPendingIcon />
</View>
);
} else if (this.state.tx.value < 0) {
return (
<View style={{ width: 25 }}>
<BlueTransactionOutgoingIcon />
</View>
);
} else {
return (
<View style={{ width: 25 }}>
<BlueTransactionIncomingIcon />
</View>
);
}
})()}
</View>
</View>
{this.state.tx.hasOwnProperty('fee') && (
<View style={{ marginTop: 15, marginBottom: 13 }}>
<BlueText style={{ fontSize: 11, fontWeight: '500', marginBottom: 4, color: '#00c49f', alignSelf: 'center' }}>
{loc.send.create.fee.toLowerCase()}{' '}
{loc.formatBalanceWithoutSuffix(this.state.tx.fee, this.state.wallet.preferredBalanceUnit, true)}{' '}
{this.state.wallet.preferredBalanceUnit !== BitcoinUnit.LOCAL_CURRENCY && this.state.wallet.preferredBalanceUnit}
</BlueText>
</View>
)}
<View
style={{
borderRadius: 11,
backgroundColor: '#eef0f4',
width: 109,
height: 21,
alignSelf: 'center',
alignItems: 'center',
justifyContent: 'center',
}}
>
<Text style={{ color: '#9aa0aa', fontSize: 11 }}>
{this.state.tx.confirmations > 6 ? '6+' : this.state.tx.confirmations} confirmations
</Text>
</View>
</BlueCard>
<View style={{ alignSelf: 'center', justifyContent: 'center' }}>
{(() => {
if (this.state.tx.confirmations === 0 && this.state.wallet && this.state.wallet.allowRBF()) {
return (
<React.Fragment>
<BlueButton
onPress={() =>
this.props.navigation.navigate('RBF', {
txid: this.state.tx.hash,
})
}
title="Replace-By-Fee (RBF)"
/>
<BlueSpacing20 />
</React.Fragment>
);
}
})()}
{(() => {
if (this.state.isCPFPpossible === buttonStatus.unknown) {
return (
<React.Fragment>
<ActivityIndicator />
<BlueSpacing20 />
</React.Fragment>
);
} else if (this.state.isCPFPpossible === buttonStatus.possible) {
return (
<React.Fragment>
<BlueButton
onPress={() =>
this.props.navigation.navigate('CPFP', {
txid: this.state.tx.hash,
wallet: this.state.wallet,
})
}
title="Bump Fee"
/>
<BlueSpacing20 />
</React.Fragment>
);
}
})()}
{(() => {
if (this.state.isRBFBumpFeePossible === buttonStatus.unknown) {
return (
<React.Fragment>
<ActivityIndicator />
<BlueSpacing20 />
</React.Fragment>
);
} else if (this.state.isRBFBumpFeePossible === buttonStatus.possible) {
return (
<React.Fragment>
<BlueButton
onPress={() =>
this.props.navigation.navigate('RBFBumpFee', {
txid: this.state.tx.hash,
wallet: this.state.wallet,
})
}
title="Bump Fee"
/>
<BlueSpacing20 />
</React.Fragment>
);
}
})()}
{() => {
if (this.state.isRBFCancelPossible === buttonStatus.unknown) {
return (
<React.Fragment>
<ActivityIndicator />
<BlueSpacing20 />
</React.Fragment>
);
} else if (this.state.isRBFCancelPossible === buttonStatus.possible) {
return (
<React.Fragment>
<TouchableOpacity style={{ marginVertical: 48 }}>
<Text
onPress={() =>
this.props.navigation.navigate('RBFCancel', {
txid: this.state.tx.hash,
wallet: this.state.wallet,
})
}
style={{ color: '#d0021b', fontSize: 15, fontWeight: '500' }}
>
{loc.send.details.cancel}
</Text>
</TouchableOpacity>
</React.Fragment>
);
}
}}
<TouchableOpacity
style={{ flexDirection: 'row', alignItems: 'center', justifyContent: 'center' }}
onPress={() => this.props.navigation.navigate('TransactionDetails', { hash: this.state.tx.hash })}
>
<Text style={{ color: '#9aa0aa', fontSize: 14, marginRight: 8 }}>{loc.send.create.details.toLowerCase()}</Text>
<Icon name="angle-right" size={18} type="font-awesome" color="#9aa0aa" />
</TouchableOpacity>
</View>
</View>
</SafeBlueArea>
);
}
}
TransactionsStatus.propTypes = {
navigation: PropTypes.shape({
goBack: PropTypes.func,
navigate: PropTypes.func,
state: PropTypes.shape({
params: PropTypes.shape({
hash: PropTypes.string,
}),
}),
}),
};
Loading…
Cancel
Save