From 3e91a6e546f58c4aaab261846695ab62a961f116 Mon Sep 17 00:00:00 2001 From: Overtorment Date: Fri, 28 Sep 2018 23:45:35 +0100 Subject: [PATCH 1/4] WIP: lnd --- screen/lnd/scanLndInvoice.js | 1 + 1 file changed, 1 insertion(+) diff --git a/screen/lnd/scanLndInvoice.js b/screen/lnd/scanLndInvoice.js index db164775..5753e599 100644 --- a/screen/lnd/scanLndInvoice.js +++ b/screen/lnd/scanLndInvoice.js @@ -124,6 +124,7 @@ export default class ScanLndInvoice extends React.Component { end = +new Date(); } catch (Err) { console.log(Err.message); + this.props.navigation.goBack(); return alert('Error'); } From 5d9a0b457b1effe45c7949593e832d93eb1db500 Mon Sep 17 00:00:00 2001 From: Overtorment Date: Sat, 29 Sep 2018 11:42:47 +0100 Subject: [PATCH 2/4] REL --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index a862ad52..36ad759d 100644 --- a/app.json +++ b/app.json @@ -7,7 +7,7 @@ "ios" ], "ios": { - "buildNumber": "77", + "buildNumber": "78", "supportsTablet": true, "bundleIdentifier": "io.bluewallet.bluewallet", "infoPlist": { From 10d3fc5ade981105b1816ad5f1ab5d0cc541c63a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Rodriguez=20V=C3=A9lez?= Date: Sat, 29 Sep 2018 08:56:01 -0400 Subject: [PATCH 3/4] ADD: open tx in external blockexplorer --- BlueComponents.js | 10 +++++++++- loc/en.js | 7 ++++--- screen/transactions/details.js | 34 +++++++++++++++++++++++++++------- 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/BlueComponents.js b/BlueComponents.js index f8c062c3..15bfb574 100644 --- a/BlueComponents.js +++ b/BlueComponents.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import Ionicons from 'react-native-vector-icons/Ionicons'; import { LinearGradient, Constants } from 'expo'; 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 { TouchableOpacity, ActivityIndicator, View, StyleSheet, Dimensions, Image, SafeAreaView, Clipboard } from 'react-native'; import { WatchOnlyWallet, LegacyWallet } from './class'; import Carousel from 'react-native-snap-carousel'; import { HDLegacyP2PKHWallet } from './class/hd-legacy-p2pkh-wallet'; @@ -146,6 +146,14 @@ export class BlueButtonLink extends Component { } } +export const BlueCopyToClipboardButton = ({ stringToCopy }) => { + return ( + Clipboard.setString(stringToCopy)}> + {loc.transactions.details.copy} + + ); +}; + export class SafeBlueArea extends Component { render() { return ( diff --git a/loc/en.js b/loc/en.js index 857d3e86..c822a4e3 100644 --- a/loc/en.js +++ b/loc/en.js @@ -87,9 +87,10 @@ module.exports = { conf: 'conf', }, details: { - title: 'transaction', - from: 'Inputs', - to: 'Outputs', + title: 'transaction details', + from: 'From', + to: 'To', + copy: 'Copy', }, }, send: { diff --git a/screen/transactions/details.js b/screen/transactions/details.js index 9a12806c..0a723edb 100644 --- a/screen/transactions/details.js +++ b/screen/transactions/details.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; -import { View, ScrollView } from 'react-native'; -import { BlueButton, SafeBlueArea, BlueCard, BlueText, BlueHeaderDefaultSub, BlueLoading, BlueSpacing20 } from '../../BlueComponents'; +import { View, ScrollView, TouchableOpacity, Linking } from 'react-native'; +import { BlueButton, SafeBlueArea, BlueCard, BlueText, BlueHeaderDefaultSub, BlueLoading, BlueSpacing20, BlueCopyToClipboardButton } from '../../BlueComponents'; import PropTypes from 'prop-types'; /** @type {AppStorage} */ let BlueApp = require('../../BlueApp'); @@ -90,21 +90,41 @@ export default class TransactionsDetails extends Component { } })()} - {loc.transactions.details.from} + + {loc.transactions.details.from} + + {this.state.from.filter(onlyUnique).join(', ')} - {loc.transactions.details.to} + + {loc.transactions.details.to} + + {arrDiff(this.state.from, this.state.to.filter(onlyUnique)).join(', ')} - Txid - {this.state.tx.hash} + + Txid + + + { + const url = `https://live.blockcypher.com/btc/tx/${this.state.tx.hash}`; + Linking.canOpenURL(url).then(supported => { + if (supported) { + Linking.openURL(url); + } + }); + }} + > + {this.state.tx.hash} + Received {formatTime(this.state.tx.received)} - Confirmed + Block Height {formatTime(this.state.tx.block_height)} Confirmations From 83d3a662fd285bc17597d61d47698ba62d256e74 Mon Sep 17 00:00:00 2001 From: Overtorment Date: Sat, 29 Sep 2018 13:58:53 +0100 Subject: [PATCH 4/4] REL --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 36ad759d..99bd9044 100644 --- a/app.json +++ b/app.json @@ -7,7 +7,7 @@ "ios" ], "ios": { - "buildNumber": "78", + "buildNumber": "79", "supportsTablet": true, "bundleIdentifier": "io.bluewallet.bluewallet", "infoPlist": {