mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2024-11-19 18:00:17 +01:00
Merge branch 'master' into 5221
This commit is contained in:
commit
0bf1961498
@ -93,6 +93,8 @@ export const BlueStorageProvider = ({ children }: { children: React.ReactNode })
|
||||
useEffect(() => {
|
||||
BlueElectrum.isDisabled().then(setIsElectrumDisabled);
|
||||
if (walletsInitialized) {
|
||||
txMetadata.current = BlueApp.tx_metadata;
|
||||
counterpartyMetadata.current = BlueApp.counterparty_metadata;
|
||||
setWallets(BlueApp.getWallets());
|
||||
BlueElectrum.connectMain();
|
||||
}
|
||||
|
@ -12,11 +12,12 @@ interface HeaderRightButtonProps {
|
||||
|
||||
const HeaderRightButton: React.FC<HeaderRightButtonProps> = ({ disabled = true, onPress, title, testID }) => {
|
||||
const { colors } = useTheme();
|
||||
const opacity = disabled ? 0.5 : 1;
|
||||
return (
|
||||
<TouchableOpacity
|
||||
accessibilityRole="button"
|
||||
disabled={disabled}
|
||||
style={[styles.save, { backgroundColor: colors.lightButton }]}
|
||||
style={[styles.save, { backgroundColor: colors.lightButton }, { opacity }]}
|
||||
onPress={onPress}
|
||||
testID={testID}
|
||||
>
|
||||
|
@ -21,7 +21,7 @@ import Broadcast from '../screen/send/Broadcast';
|
||||
import IsItMyAddress from '../screen/send/isItMyAddress';
|
||||
import Success from '../screen/send/success';
|
||||
import CPFP from '../screen/transactions/CPFP';
|
||||
import TransactionDetails from '../screen/transactions/details';
|
||||
import TransactionDetails from '../screen/transactions/TransactionDetails';
|
||||
import RBFBumpFee from '../screen/transactions/RBFBumpFee';
|
||||
import RBFCancel from '../screen/transactions/RBFCancel';
|
||||
import TransactionStatus from '../screen/transactions/TransactionStatus';
|
||||
|
@ -103,9 +103,9 @@ const TransactionDetails = () => {
|
||||
}, [tx, txMetadata, memo, counterpartyLabel, paymentCode, saveToDisk, counterpartyMetadata]);
|
||||
|
||||
const HeaderRight = useMemo(
|
||||
() => <HeaderRightButton disabled={isLoading} onPress={handleOnSaveButtonTapped} title={loc.wallets.details_save} />,
|
||||
() => <HeaderRightButton onPress={handleOnSaveButtonTapped} disabled={false} title={loc.wallets.details_save} />,
|
||||
|
||||
[isLoading, handleOnSaveButtonTapped],
|
||||
[handleOnSaveButtonTapped],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
Loading…
Reference in New Issue
Block a user