Lightning address: trigger auto-accept for all compatible backends

ZeusLN · Oct 17, 2023 · 2b6aa20 · 2b6aa20
1 parent 28dbb85
commit 2b6aa20
Showing 1 changed file with 16 additions and 18 deletions.
diff --git a/views/Wallet/Wallet.tsx b/views/Wallet/Wallet.tsx
@@ -375,24 +375,6 @@ export default class Wallet extends React.Component<WalletProps, WalletState> {
                 if (SettingsStore.settings.automaticDisasterRecoveryBackup)
                     ChannelBackupStore.initSubscribeChannelEvents();
             }
-
-            if (
-                lightningAddress.enabled &&
-                BackendUtils.supportsCustomPreimages() &&
-                !NodeInfoStore.testnet
-            ) {
-                LightningAddressStore.status();
-
-                if (lightningAddress.automaticallyAccept) {
-                    LightningAddressStore.prepareToAutomaticallyAccept();
-                }
-
-                if (
-                    SettingsStore.settings.lightningAddress?.notifications === 1
-                ) {
-                    LightningAddressStore.updatePushCredentials();
-                }
-            }
         } else if (implementation === 'lndhub') {
             if (connecting) {
                 await login({ login: username, password }).then(async () => {
@@ -424,6 +406,22 @@ export default class Wallet extends React.Component<WalletProps, WalletState> {
             ChannelsStore.getChannels();
         }
 
+        if (
+            lightningAddress.enabled &&
+            BackendUtils.supportsCustomPreimages() &&
+            !NodeInfoStore.testnet
+        ) {
+            LightningAddressStore.status();
+
+            if (lightningAddress.automaticallyAccept) {
+                LightningAddressStore.prepareToAutomaticallyAccept();
+            }
+
+            if (SettingsStore.settings.lightningAddress?.notifications === 1) {
+                LightningAddressStore.updatePushCredentials();
+            }
+        }
+
         if (connecting) {
             setConnectingStatus(false);
         }