mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2024-11-19 09:50:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into alerttit

Browse Source
This commit is contained in:
Marcos Rodriguez Vélez 2024-09-20 08:08:28 -04:00 committed by GitHub
commit 3c0790c8b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/SelectFeeModal.tsx
View File

@ -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) {

4
ios/Podfile.lock
View File

@ -1641,7 +1641,7 @@ PODS:
- React
- RNRate (1.2.12):
- React-Core
- RNReactNativeHapticFeedback (2.3.2):
- RNReactNativeHapticFeedback (2.3.3):
- DoubleConversion
- glog
- hermes-engine
@ -2215,7 +2215,7 @@ SPEC CHECKSUMS:
RNPrivacySnapshot: 71919dde3c6a29dd332115409c2aec564afee8f4
RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
RNRate: ef3bcff84f39bb1d1e41c5593d3eea4aab2bd73a
RNReactNativeHapticFeedback: 9b35ff960958c399b03581140fa2d1499c09c8b6
RNReactNativeHapticFeedback: 0d591ea1e150f36cb96d868d4e8d77272243d78a
RNReanimated: ece067b779e0d6c7887c6bb80d381d0a0efd43c9
RNScreens: 19719a9c326e925498ac3b2d35c4e50fe87afc06
RNShare: 0fad69ae2d71de9d1f7b9a43acf876886a6cb99c

2
screen/send/SendDetails.tsx
View File

@ -1371,7 +1371,7 @@ const SendDetails = () => {
feeRate={feeRate}
setCustomFee={setCustomFee}
setFeePrecalc={setFeePrecalc}
feeUnit={feeUnit || BitcoinUnit.BTC}
feeUnit={units[scrollIndex.current]}
/>
</View>
<DismissKeyboardInputAccessory />