Merge pull request #1999 from kaloudis/settings-lsp-taproot-default

Settings: Flow LSP: request Simple Taproot Channels by default
ZeusLN · Aug 27, 2024 · 77874b9 · 77874b9
2 parents 6d05070 + dc9c435
commit 77874b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/stores/SettingsStore.ts b/stores/SettingsStore.ts
@@ -1131,7 +1131,7 @@ export default class SettingsStore {
         lspMainnet: DEFAULT_LSP_MAINNET,
         lspTestnet: DEFAULT_LSP_TESTNET,
         lspAccessKey: '',
-        requestSimpleTaproot: false,
+        requestSimpleTaproot: true,
         //lsps1
         lsps1RestMainnet: DEFAULT_LSPS1_REST_MAINNET,
         lsps1RestTestnet: DEFAULT_LSPS1_REST_TESTNET,
@@ -1386,25 +1386,10 @@ export default class SettingsStore {
                         localeMigrationMapping[newSettings.locale];
                 }
 
-                // TODO PEGASUS
-                // temporarily toggle all beta users settings for now
-                const MOD_KEY = 'beta5-mod';
+                const MOD_KEY = 'lsp-taproot-mod';
                 const mod = await EncryptedStorage.getItem(MOD_KEY);
                 if (!mod) {
-                    newSettings.expressGraphSync = true;
-                    if (newSettings.payments) {
-                        newSettings.payments.defaultFeePercentage = '5.0';
-                        newSettings.payments.defaultFeeFixed = '1000';
-                    } else {
-                        newSettings.payments = {
-                            defaultFeeMethod: 'fixed', // deprecated
-                            defaultFeePercentage: '5.0',
-                            defaultFeeFixed: '1000',
-                            timeoutSeconds: '60',
-                            preferredMempoolRate: 'fastestFee'
-                        };
-                    }
-                    newSettings.automaticDisasterRecoveryBackup = true;
+                    newSettings.requestSimpleTaproot = true;
                     this.setSettings(JSON.stringify(newSettings));
                     await EncryptedStorage.setItem(MOD_KEY, 'true');
                 }

diff --git a/views/Settings/LSP.tsx b/views/Settings/LSP.tsx
@@ -40,7 +40,7 @@ export default class LSP extends React.Component<LSPProps, LSPState> {
         enableLSP: true,
         lsp: '',
         accessKey: '',
-        requestSimpleTaproot: false
+        requestSimpleTaproot: true
     };
 
     async UNSAFE_componentWillMount() {
@@ -53,7 +53,10 @@ export default class LSP extends React.Component<LSPProps, LSPState> {
                 ? settings.lspTestnet
                 : settings.lspMainnet,
             accessKey: settings.lspAccessKey,
-            requestSimpleTaproot: settings.requestSimpleTaproot
+            requestSimpleTaproot:
+                settings?.requestSimpleTaproot !== null
+                    ? settings.requestSimpleTaproot
+                    : true
         });
     }