mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2024-11-19 09:50:15 +01:00
Merge branch 'master' into balancde
This commit is contained in:
commit
26c5adbc54
@ -38,7 +38,7 @@ interface SelectFeeModalProps {
|
||||
}
|
||||
|
||||
const SelectFeeModal = forwardRef<BottomModalHandle, SelectFeeModalProps>(
|
||||
({ networkTransactionFees, feePrecalc, feeRate, setCustomFee, setFeePrecalc, feeUnit }, ref) => {
|
||||
({ networkTransactionFees, feePrecalc, feeRate, setCustomFee, setFeePrecalc, feeUnit = BitcoinUnit.BTC }, ref) => {
|
||||
const [customFee, setCustomFeeState] = useState('');
|
||||
const feeModalRef = useRef<BottomModalHandle>(null);
|
||||
const customModalRef = useRef<BottomModalHandle>(null);
|
||||
@ -139,7 +139,7 @@ const SelectFeeModal = forwardRef<BottomModalHandle, SelectFeeModalProps>(
|
||||
},
|
||||
];
|
||||
|
||||
const formatFee = (fee: number) => formatBalance(fee, feeUnit!, true);
|
||||
const formatFee = (fee: number) => formatBalance(fee, feeUnit, true);
|
||||
|
||||
const handleCustomFeeSubmit = async () => {
|
||||
if (!/^\d+$/.test(customFee) || Number(customFee) <= 0) {
|
||||
|
@ -1371,7 +1371,7 @@ const SendDetails = () => {
|
||||
feeRate={feeRate}
|
||||
setCustomFee={setCustomFee}
|
||||
setFeePrecalc={setFeePrecalc}
|
||||
feeUnit={feeUnit || BitcoinUnit.BTC}
|
||||
feeUnit={units[scrollIndex.current]}
|
||||
/>
|
||||
</View>
|
||||
<DismissKeyboardInputAccessory />
|
||||
|
Loading…
Reference in New Issue
Block a user