From deca790284e819804e347ffc0ee81ad561b6168f Mon Sep 17 00:00:00 2001 From: Evan Kaloudis Date: Tue, 1 Oct 2024 18:51:51 -0400 Subject: [PATCH 1/2] Receive: Blinded Paths: turn off and disable AMP and Route Hints --- views/Receive.tsx | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/views/Receive.tsx b/views/Receive.tsx index 1027c956c..0c74e34bb 100644 --- a/views/Receive.tsx +++ b/views/Receive.tsx @@ -2504,6 +2504,7 @@ export default class Receive extends React.Component< !routeHints }) } + disabled={blindedPaths} /> )} @@ -2638,6 +2639,7 @@ export default class Receive extends React.Component< !ampInvoice }) } + disabled={blindedPaths} /> )} @@ -2670,10 +2672,22 @@ export default class Receive extends React.Component< - this.setState({ - blindedPaths: - !blindedPaths - }) + this.setState( + ( + prevState + ) => ({ + blindedPaths: + !blindedPaths, + ampInvoice: + !blindedPaths + ? false + : prevState.ampInvoice, + routeHints: + !blindedPaths + ? false + : prevState.routeHints + }) + ) } /> From 952389c15297886e877628793e5f21b6411ee5f2 Mon Sep 17 00:00:00 2001 From: Evan Kaloudis Date: Tue, 1 Oct 2024 19:03:09 -0400 Subject: [PATCH 2/2] Settings: Invoices: Blinded Paths: turn off and disable AMP and Route Hints --- views/Receive.tsx | 24 ++++++++---------------- views/Settings/InvoicesSettings.tsx | 11 ++++++++--- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/views/Receive.tsx b/views/Receive.tsx index 0c74e34bb..0d8921012 100644 --- a/views/Receive.tsx +++ b/views/Receive.tsx @@ -2672,22 +2672,14 @@ export default class Receive extends React.Component< - this.setState( - ( - prevState - ) => ({ - blindedPaths: - !blindedPaths, - ampInvoice: - !blindedPaths - ? false - : prevState.ampInvoice, - routeHints: - !blindedPaths - ? false - : prevState.routeHints - }) - ) + this.setState({ + blindedPaths: + !blindedPaths, + ampInvoice: + false, + routeHints: + false + }) } /> diff --git a/views/Settings/InvoicesSettings.tsx b/views/Settings/InvoicesSettings.tsx index 885673245..444c15709 100644 --- a/views/Settings/InvoicesSettings.tsx +++ b/views/Settings/InvoicesSettings.tsx @@ -371,6 +371,7 @@ export default class InvoicesSettings extends React.Component< } }); }} + disabled={blindedPaths} /> )} @@ -413,6 +414,7 @@ export default class InvoicesSettings extends React.Component< } }); }} + disabled={blindedPaths} /> )} @@ -440,8 +442,11 @@ export default class InvoicesSettings extends React.Component< value={blindedPaths} onValueChange={async () => { this.setState({ - blindedPaths: !blindedPaths + blindedPaths: !blindedPaths, + ampInvoice: false, + routeHints: false }); + await updateSettings({ invoices: { addressType, @@ -449,8 +454,8 @@ export default class InvoicesSettings extends React.Component< expiry, timePeriod, expirySeconds, - routeHints, - ampInvoice, + routeHints: false, + ampInvoice: false, blindedPaths: !blindedPaths, showCustomPreimageField }