Browse Source

Merge branch 'master' of github.com:BlueWallet/BlueWallet into acinq

acinq-only
Marcos Rodriguez Vélez 6 years ago
parent
commit
6d6a5ffb9e
  1. 10
      BlueComponents.js
  2. 7
      class/lightning-custodian-wallet.js
  3. 1
      screen/lnd/scanLndInvoice.js
  4. 1
      screen/send/details.js

10
BlueComponents.js

@ -178,7 +178,14 @@ export const BlueNavigationStyle = (navigation, withNavigationCloseButton = fals
headerRight: withNavigationCloseButton ? (
<TouchableOpacity
style={{ width: 40, height: 40, padding: 14 }}
onPress={customCloseButtonFunction === undefined ? () => navigation.goBack(null) : customCloseButtonFunction}
onPress={
customCloseButtonFunction === undefined
? () => {
Keyboard.dismiss();
navigation.goBack(null);
}
: customCloseButtonFunction
}
>
<Image style={{ alignSelf: 'center' }} source={require('./img/close.png')} />
</TouchableOpacity>
@ -1629,6 +1636,7 @@ export class BlueAddressInput extends Component {
<TouchableOpacity
disabled={this.props.isLoading}
onPress={() => {
Keyboard.dismiss();
ImagePicker.showImagePicker(
{
title: null,

7
class/lightning-custodian-wallet.js

@ -49,13 +49,11 @@ export class LightningCustodianWallet extends LegacyWallet {
}
timeToRefreshBalance() {
// only manual refresh for now
return false;
return (+new Date() - this._lastBalanceFetch) / 1000 > 3600; // 1hr
}
timeToRefreshTransaction() {
// only manual refresh for now
return false;
return (+new Date() - this._lastTxFetch) / 1000 > 3600; // 1hr
}
static fromJson(param) {
@ -434,6 +432,7 @@ export class LightningCustodianWallet extends LegacyWallet {
throw new Error('API unexpected response: ' + JSON.stringify(response.body));
}
this._lastTxFetch = +new Date();
this.transactions_raw = json;
}

1
screen/lnd/scanLndInvoice.js

@ -110,6 +110,7 @@ export default class ScanLndInvoice extends React.Component {
isLoading: false,
});
} catch (Err) {
Keyboard.dismiss();
this.setState({ isLoading: false });
alert(Err.message);
}

1
screen/send/details.js

@ -284,6 +284,7 @@ export default class SendDetails extends Component {
}
async createTransaction() {
Keyboard.dismiss();
this.setState({ isLoading: true });
let error = false;
let requestedSatPerByte = this.state.fee.toString().replace(/\D/g, '');

Loading…
Cancel
Save