diff --git a/package-lock.json b/package-lock.json index 90e019e6c..d76bb145c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11590,9 +11590,8 @@ } }, "react-native-tooltip": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/react-native-tooltip/-/react-native-tooltip-5.2.0.tgz", - "integrity": "sha512-3mbPGd/VDfb3dUZmdmgg4eE8idJU4OyYM9ItGifnofz+Cz50Aua+sVGo2Ecc7zHV0S+kM0mOyLL758hhTz2gDw==" + "version": "git+https://github.com/BlueWallet/react-native-tooltip.git#72329a1a687ce9938eca11f0026f1a58c326db33", + "from": "git+https://github.com/BlueWallet/react-native-tooltip.git" }, "react-native-vector-icons": { "version": "6.2.0", diff --git a/screen/send/details.js b/screen/send/details.js index b8b7d1cf5..a6e8b0196 100644 --- a/screen/send/details.js +++ b/screen/send/details.js @@ -283,11 +283,19 @@ export default class SendDetails extends Component { Keyboard.dismiss(); BitcoinBIP70TransactionDecode.decode(text) .then(response => { + let networkTransactionFees = this.state.networkTransactionFees; + if (response.fee > networkTransactionFees.fastestFee) { + networkTransactionFees.fastestFee = response.fee; + } else { + networkTransactionFees.halfHourFee = response.fee; + } this.setState({ address: response.address, amount: loc.formatBalanceWithoutSuffix(response.amount, BitcoinUnit.BTC, false), memo: response.memo, - fee: response.fee, + networkTransactionFees, + fee: networkTransactionFees.fastestFee.toFixed(0), + feeSliderValue: networkTransactionFees.fastestFee.toFixed(0), bip70TransactionExpiration: response.expires, isLoading: false, });