mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-03-15 11:59:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into ts

Browse source
This commit is contained in:
Marcos Rodriguez Velez 2024-05-27 03:27:21 -04:00
commit ae392adadd
No known key found for this signature in database
GPG key ID: 6030B2F48CCE86D7
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
blue_modules/storage-context.tsx
View file

@ -93,6 +93,8 @@ export const BlueStorageProvider = ({ children }: { children: React.ReactNode })
useEffect(() => { useEffect(() => {
BlueElectrum.isDisabled().then(setIsElectrumDisabled); BlueElectrum.isDisabled().then(setIsElectrumDisabled);
if (walletsInitialized) { if (walletsInitialized) {
txMetadata.current = BlueApp.tx_metadata;
counterpartyMetadata.current = BlueApp.counterparty_metadata;
setWallets(BlueApp.getWallets()); setWallets(BlueApp.getWallets());
BlueElectrum.connectMain(); BlueElectrum.connectMain();
} }

3
components/HeaderRightButton.tsx
View file

@ -12,11 +12,12 @@ interface HeaderRightButtonProps {
const HeaderRightButton: React.FC<HeaderRightButtonProps> = ({ disabled = true, onPress, title, testID }) => { const HeaderRightButton: React.FC<HeaderRightButtonProps> = ({ disabled = true, onPress, title, testID }) => {
const { colors } = useTheme(); const { colors } = useTheme();
const opacity = disabled ? 0.5 : 1;
return ( return (
<TouchableOpacity <TouchableOpacity
accessibilityRole="button" accessibilityRole="button"
disabled={disabled} disabled={disabled}
style={[styles.save, { backgroundColor: colors.lightButton }]} style={[styles.save, { backgroundColor: colors.lightButton }, { opacity }]}
onPress={onPress} onPress={onPress}
testID={testID} testID={testID}
> >

2
navigation/DetailViewScreensStack.tsx
View file

@ -21,7 +21,7 @@ import Broadcast from '../screen/send/Broadcast';
import IsItMyAddress from '../screen/send/isItMyAddress'; import IsItMyAddress from '../screen/send/isItMyAddress';
import Success from '../screen/send/success'; import Success from '../screen/send/success';
import CPFP from '../screen/transactions/CPFP'; 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 RBFBumpFee from '../screen/transactions/RBFBumpFee';
import RBFCancel from '../screen/transactions/RBFCancel'; import RBFCancel from '../screen/transactions/RBFCancel';
import TransactionStatus from '../screen/transactions/TransactionStatus'; import TransactionStatus from '../screen/transactions/TransactionStatus';

4
screen/transactions/details.tsx → screen/transactions/TransactionDetails.tsx
View file

@ -107,9 +107,9 @@ const TransactionDetails = () => {
}, [tx, txMetadata, memo, counterpartyLabel, paymentCode, saveToDisk, counterpartyMetadata]); }, [tx, txMetadata, memo, counterpartyLabel, paymentCode, saveToDisk, counterpartyMetadata]);
const HeaderRight = useMemo( 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(() => { useEffect(() => {