Browse Source

FIX: Removed remaining old-style headers

localNotifications
Marcos Rodriguez Vélez 6 years ago
parent
commit
78988dfe1f
  1. 2
      ios/BlueWallet/Info.plist
  2. 4
      screen/lnd/lndViewInvoice.js
  3. 12
      screen/lnd/manageFunds.js
  4. 12
      screen/wallets/export.js
  5. 6
      screen/wallets/transactions.js

2
ios/BlueWallet/Info.plist

@ -33,7 +33,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>177</string>
<string>179</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

4
screen/lnd/lndViewInvoice.js

@ -16,7 +16,7 @@ export default class LNDViewInvoice extends Component {
title: loc.receive.header,
headerLeft: null,
});
constructor(props) {
super(props);
const invoice = props.navigation.getParam('invoice');
@ -47,7 +47,7 @@ export default class LNDViewInvoice extends Component {
}
componentWillUnmount() {
clearInterval(this.fetchInvoiceInterval)
clearInterval(this.fetchInvoiceInterval);
}
copyToClipboard = () => {

12
screen/lnd/manageFunds.js

@ -2,7 +2,7 @@
import React, { Component } from 'react';
import { TouchableOpacity, View } from 'react-native';
import { Dropdown } from 'react-native-material-dropdown';
import { BlueSpacingVariable, BlueLoading, SafeBlueArea, BlueCard, BlueHeaderDefaultSub } from '../../BlueComponents';
import { BlueSpacingVariable, BlueNavigationStyle, BlueLoading, SafeBlueArea, BlueCard } from '../../BlueComponents';
import { ListItem } from 'react-native-elements';
import PropTypes from 'prop-types';
import { LightningCustodianWallet } from '../../class/lightning-custodian-wallet';
@ -13,11 +13,11 @@ let loc = require('../../loc');
let data = [];
export default class ManageFunds extends Component {
static navigationOptions = {
header: ({ navigation }) => {
return <BlueHeaderDefaultSub leftText={loc.lnd.title} onClose={() => navigation.goBack(null)} />;
},
};
static navigationOptions = ({ navigation }) => ({
...BlueNavigationStyle(navigation, true),
title: loc.lnd.title,
headerLeft: null,
});
constructor(props) {
super(props);

12
screen/wallets/export.js

@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { Dimensions, Platform, ActivityIndicator, View } from 'react-native';
import { QRCode as QRSlow } from 'react-native-custom-qr-codes';
import { BlueSpacing40, SafeBlueArea, BlueCard, BlueText, BlueHeaderDefaultSub } from '../../BlueComponents';
import { BlueSpacing40, SafeBlueArea, BlueNavigationStyle, BlueCard, BlueText } from '../../BlueComponents';
import PropTypes from 'prop-types';
const QRFast = require('react-native-qrcode');
/** @type {AppStorage} */
@ -17,11 +17,11 @@ 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)} />;
},
};
static navigationOptions = ({ navigation }) => ({
...BlueNavigationStyle(navigation, true),
title: loc.wallets.export.title,
headerLeft: null,
});
constructor(props) {
super(props);

6
screen/wallets/transactions.js

@ -302,16 +302,16 @@ export default class WalletTransactions extends Component {
const invoiceExpiration = item.timestamp + item.expire_time;
if (invoiceExpiration > now) {
return loc.formatBalanceWithoutSuffix(item.value && item.value, BitcoinUnit.BTC);
return loc.formatBalanceWithoutSuffix(item.value && item.value, this.state.wallet.getPreferredBalanceUnit()).toString();
} else if (invoiceExpiration < now) {
if (item.ispaid) {
return loc.formatBalanceWithoutSuffix(item.value && item.value, BitcoinUnit.BTC);
return loc.formatBalanceWithoutSuffix(item.value && item.value, this.state.wallet.getPreferredBalanceUnit()).toString();
} else {
return loc.lnd.expired;
}
}
} else {
return loc.formatBalanceWithoutSuffix(item.value && item.value, BitcoinUnit.BTC);
return loc.formatBalanceWithoutSuffix(item.value && item.value, this.state.wallet.getPreferredBalanceUnit()).toString();
}
};

Loading…
Cancel
Save