mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2025-02-23 23:27:26 +01:00
Merge pull request #2140 from BlueWallet/dim
FIX: Dim nonselected wallets on additional screens
This commit is contained in:
commit
b5a6e095fd
7 changed files with 19 additions and 4 deletions
|
@ -177,6 +177,7 @@ export default class LNDCreateInvoice extends Component {
|
|||
|
||||
componentDidMount() {
|
||||
console.log('lnd/lndCreateInvoice mounted');
|
||||
this.context.setSelectedWallet(this.state.fromWallet.getID());
|
||||
if (this.state.fromWallet.getUserHasSavedExport()) {
|
||||
this.renderReceiveDetails();
|
||||
} else {
|
||||
|
@ -411,7 +412,10 @@ export default class LNDCreateInvoice extends Component {
|
|||
};
|
||||
|
||||
onWalletSelect = wallet => {
|
||||
this.setState({ fromWallet: wallet }, () => this.props.navigation.pop());
|
||||
this.setState({ fromWallet: wallet }, () => {
|
||||
this.context.setSelectedWallet(wallet.getID());
|
||||
this.props.navigation.pop();
|
||||
});
|
||||
};
|
||||
|
||||
render() {
|
||||
|
|
|
@ -137,6 +137,7 @@ export default class LNDViewInvoice extends Component {
|
|||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.context.setSelectedWallet(this.state.fromWallet.getID());
|
||||
console.log('LNDViewInvoice - componentDidMount');
|
||||
this.fetchInvoiceInterval = setInterval(async () => {
|
||||
if (this.state.isFetchingInvoices) {
|
||||
|
|
|
@ -326,8 +326,9 @@ export default class SendDetails extends Component {
|
|||
};
|
||||
|
||||
async componentDidMount() {
|
||||
this.renderNavigationHeader();
|
||||
console.log('send/details - componentDidMount');
|
||||
this.renderNavigationHeader();
|
||||
this.context.setSelectedWallet(this.state.fromWallet.getID());
|
||||
/** @type {BitcoinTransaction[]} */
|
||||
const addresses = [];
|
||||
let initialMemo = '';
|
||||
|
@ -669,6 +670,7 @@ export default class SendDetails extends Component {
|
|||
const changeWallet = () => {
|
||||
this.setState({ fromWallet: wallet }, () => {
|
||||
this.renderNavigationHeader();
|
||||
this.context.setSelectedWallet(wallet.getID());
|
||||
this.props.navigation.pop();
|
||||
});
|
||||
};
|
||||
|
|
|
@ -158,6 +158,7 @@ export default class TransactionsStatus extends Component {
|
|||
if (t.hash === hash) {
|
||||
console.log('tx', hash, 'belongs to', w.getLabel());
|
||||
wallet = w;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -194,6 +195,7 @@ export default class TransactionsStatus extends Component {
|
|||
isRBFCancelPossible: buttonStatus.notPossible,
|
||||
});
|
||||
}
|
||||
this.context.setSelectedWallet(this.state.wallet.getID());
|
||||
}
|
||||
|
||||
async checkPossibilityOfCPFP() {
|
||||
|
|
|
@ -94,7 +94,7 @@ const styles = StyleSheet.create({
|
|||
});
|
||||
|
||||
const WalletDetails = () => {
|
||||
const { saveToDisk, wallets, deleteWallet } = useContext(BlueStorageContext);
|
||||
const { saveToDisk, wallets, deleteWallet, setSelectedWallet } = useContext(BlueStorageContext);
|
||||
const { walletID } = useRoute().params;
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [backdoorPressed, setBackdoorPressed] = useState(0);
|
||||
|
@ -155,6 +155,11 @@ const WalletDetails = () => {
|
|||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
setSelectedWallet(walletID);
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [walletID]);
|
||||
|
||||
const presentWalletHasBalanceAlert = useCallback(async () => {
|
||||
ReactNativeHapticFeedback.trigger('notificationWarning', { ignoreAndroidSystemSettings: false });
|
||||
try {
|
||||
|
|
|
@ -46,6 +46,7 @@ const WalletsList = () => {
|
|||
refreshAllWalletTransactions,
|
||||
newWalletAdded,
|
||||
setNewWalletAdded,
|
||||
setSelectedWallet,
|
||||
} = useContext(BlueStorageContext);
|
||||
const { width } = useWindowDimensions();
|
||||
const { colors, scanImage } = useTheme();
|
||||
|
@ -84,6 +85,7 @@ const WalletsList = () => {
|
|||
useFocusEffect(
|
||||
useCallback(() => {
|
||||
verifyBalance();
|
||||
setSelectedWallet('');
|
||||
StatusBar.setBarStyle('default');
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, []),
|
||||
|
|
|
@ -106,7 +106,6 @@ const WalletTransactions = () => {
|
|||
const interval = setInterval(() => setTimeElapsed(prev => prev + 1), 60000);
|
||||
return () => {
|
||||
clearInterval(interval);
|
||||
setSelectedWallet('');
|
||||
};
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, []);
|
||||
|
|
Loading…
Add table
Reference in a new issue