Remove Lightning shortcut

Author: angelix

common/src/commonMain/composeResources/values/strings.xml

@@ -1617,4 +1617,7 @@
     <string name="id_you_will_receive_an_email_from">You will receive an email from Blockstream support</string>
     <string name="id_system_default">System Default</string>
     <string name="id_transact">Transact</string>
+    <string name="id_enable_notifications">Enable Notifications</string>
+    <string name="id_disable_notifications">Disable Notifications</string>
+    <string name="id_enable_push_notifications_for_seamless">Enable push notifications for seamless lightning payments. No need to keep your app open to receive.</string>
 </resources>

common/src/commonMain/kotlin/com/blockstream/common/events/Events.kt

@@ -47,8 +47,6 @@ class Events : Event {
     data class ArchiveAccount(val account: Account): Event
     data class UnArchiveAccount(val account: Account, val navigateToRoot: Boolean): Event
     data class RemoveAccount(val account: Account): Event
-    data class RemoveLightningShortcut(val wallet: GreenWallet? = null): Event
-    data class AskRemoveLightningShortcut(val wallet: GreenWallet? = null): Event
     data class SetAccountAsset(val accountAsset: AccountAsset, val setAsActive: Boolean = false): Event
     data class SetBarcodeScannerResult(val scannedText : String): Event
     class ProvideCipher(

common/src/commonMain/kotlin/com/blockstream/common/models/GreenViewModel.kt

@@ -452,12 +452,6 @@ open class GreenViewModel constructor(
             is Events.RemoveAccount -> {
                  removeAccount(account = event.account)
             }
-            is Events.RemoveLightningShortcut -> {
-                removeLightningShortcut(greenWallet = event.wallet ?: greenWallet)
-            }
-            is Events.AskRemoveLightningShortcut -> {
-                postSideEffect(SideEffects.AskRemoveLightningShortcut(wallet = event.wallet ?: greenWallet))
-            }
             is EventWithSideEffect -> {
                 postSideEffect(event.sideEffect)
             }
@@ -748,14 +742,6 @@ open class GreenViewModel constructor(
         }
     }
 
-    private fun removeLightningShortcut(greenWallet: GreenWallet) {
-        doAsync({
-            database.deleteLoginCredentials(greenWallet.id, CredentialType.LIGHTNING_MNEMONIC)
-        }, onSuccess = {
-
-        })
-    }
-
     private fun setActiveAccount(account: Account) {
         session.setActiveAccount(account)
 
@@ -859,25 +845,6 @@ open class GreenViewModel constructor(
         })
     }
 
-    protected suspend fun _enableLightningShortcut() {
-        sessionOrNull?.also { session ->
-            val encryptedData = withContext(context = Dispatchers.IO) {
-                session.deriveLightningMnemonic().let {
-                    greenKeystore.encryptData(it.encodeToByteArray())
-                }
-            }
-
-            database.replaceLoginCredential(
-                createLoginCredentials(
-                    walletId = greenWallet.id,
-                    network = session.lightning!!.id,
-                    credentialType = CredentialType.LIGHTNING_MNEMONIC,
-                    encryptedData = encryptedData
-                )
-            )
-        }
-    }
-
     override fun interactionRequest(
         gdkHardwareWallet: GdkHardwareWallet,
         message: String?,

common/src/commonMain/kotlin/com/blockstream/common/models/add/AddAccountViewModelAbstract.kt

@@ -190,14 +190,7 @@ abstract class AddAccountViewModelAbstract(greenWallet: GreenWallet, val assetId
             postEvent(Events.SetAccountAsset(accountAsset, setAsActive = true))
             postSideEffect(SideEffects.AccountCreated(accountAsset))
 
-            val navigateToRoot = SideEffects.NavigateToRoot(popTo = popTo)
-
-            if (it.isLightning && !greenWallet.isEphemeral) {
-                postSideEffect(SideEffects.LightningShortcut)
-                _pendingSideEffect = navigateToRoot
-            } else {
-                postSideEffect(navigateToRoot)
-            }
+            postSideEffect(SideEffects.NavigateToRoot(popTo = popTo))
 
             countly.createAccount(session, it)
         })

common/src/commonMain/kotlin/com/blockstream/common/models/onboarding/phone/PinViewModel.kt

@@ -329,12 +329,7 @@ class PinViewModel constructor(
             onProgress.value = it == null
             rocketAnimation.value = it == null
         }, onSuccess = {
-            if (session.hasLightning && !setupArgs.isRecoveryFlow) {
-                _greenWallet = it
-                postSideEffect(SideEffects.LightningShortcut)
-            } else {
-                postSideEffect(SideEffects.NavigateTo(NavigateDestinations.WalletOverview(it)))
-            }
+            postSideEffect(SideEffects.NavigateTo(NavigateDestinations.WalletOverview(it)))
         })
     }
 

common/src/commonMain/kotlin/com/blockstream/common/models/overview/AccountOverviewViewModel.kt

@@ -2,18 +2,14 @@ package com.blockstream.common.models.overview
 
 import blockstream_green.common.generated.resources.Res
 import blockstream_green.common.generated.resources.box_arrow_down
-import blockstream_green.common.generated.resources.id_add_lightning_shortcut
 import blockstream_green.common.generated.resources.id_archive_account
 import blockstream_green.common.generated.resources.id_copied_to_clipboard
 import blockstream_green.common.generated.resources.id_help
 import blockstream_green.common.generated.resources.id_node_info
 import blockstream_green.common.generated.resources.id_remove
-import blockstream_green.common.generated.resources.id_remove_lightning_shortcut
 import blockstream_green.common.generated.resources.id_rename_account
 import blockstream_green.common.generated.resources.id_rescan_swaps_initiated
 import blockstream_green.common.generated.resources.info
-import blockstream_green.common.generated.resources.lightning
-import blockstream_green.common.generated.resources.lightning_slash
 import blockstream_green.common.generated.resources.question
 import blockstream_green.common.generated.resources.text_aa
 import blockstream_green.common.generated.resources.trash
@@ -191,7 +187,6 @@ class AccountOverviewViewModel(greenWallet: GreenWallet, accountAsset: AccountAs
         object Send : Event
         object Receive : Event
         object Refresh : Event
-        object EnableLightningShortcut : Event
         object LoadMoreTransactions : Event
         object RescanSwaps : Event
         object CopyAccountId : Event
@@ -239,22 +234,6 @@ class AccountOverviewViewModel(greenWallet: GreenWallet, accountAsset: AccountAs
                                 postEvent(NavigateDestinations.LightningNode(greenWallet = greenWallet))
                             }
                         ).takeIf { account.isLightning },
-                        NavAction(
-                            title = getString(Res.string.id_add_lightning_shortcut),
-                            icon = Res.drawable.lightning,
-                            isMenuEntry = true,
-                            onClick = {
-                                postEvent(LocalEvents.EnableLightningShortcut)
-                            }
-                        ).takeIf { account.isLightning && hasLightningShortcut == false },
-                        NavAction(
-                            title = getString(Res.string.id_remove_lightning_shortcut),
-                            icon = Res.drawable.lightning_slash,
-                            isMenuEntry = true,
-                            onClick = {
-                                postEvent(Events.AskRemoveLightningShortcut())
-                            }
-                        ).takeIf { account.isLightning &&  hasLightningShortcut == true },
                         NavAction(
                             title = getString(Res.string.id_remove),
                             icon = Res.drawable.trash,
@@ -319,10 +298,6 @@ class AccountOverviewViewModel(greenWallet: GreenWallet, accountAsset: AccountAs
                 session.refresh(account = account)
             }
 
-            is LocalEvents.EnableLightningShortcut -> {
-                enableLightningShortcut()
-            }
-
             is LocalEvents.LoadMoreTransactions -> {
                 loadMoreTransactions()
             }
@@ -353,16 +328,6 @@ class AccountOverviewViewModel(greenWallet: GreenWallet, accountAsset: AccountAs
         session.getTransactions(account = account, isReset = false, isLoadMore = true)
     }
 
-    private fun enableLightningShortcut() {
-        if (account.isLightning) {
-            doAsync({
-                _enableLightningShortcut()
-            }, onSuccess = {
-                postSideEffect(SideEffects.LightningShortcut)
-            })
-        }
-    }
-
     private fun rescanSwaps() {
         postSideEffect(SideEffects.Snackbar(StringHolder.create(Res.string.id_rescan_swaps_initiated)))
 

common/src/commonMain/kotlin/com/blockstream/common/sideeffects/SideEffects.kt

@@ -66,8 +66,6 @@ class SideEffects : SideEffect {
     data class ShareFile(val path: Path) : SideEffect
     data class TwoFactorResolver(val data: TwoFactorResolverData) : SideEffect
     data object OpenDenominationExchangeRate : SideEffect
-    data object LightningShortcut : SideEffect
-    data class AskRemoveLightningShortcut(val wallet: GreenWallet) : SideEffect
     data object EnableBluetooth: SideEffect
     data object EnableLocationService: SideEffect
     data object AskForBluetoothPermissions: SideEffect

compose/src/androidMain/kotlin/com/blockstream/compose/dialogs/LightningShortcutDialog.android.kt

@@ -26,7 +26,6 @@ import blockstream_green.common.generated.resources.id_ephemeral_wallets
 import blockstream_green.common.generated.resources.id_hardware_devices
 import blockstream_green.common.generated.resources.id_setup_a_new_wallet
 import com.blockstream.common.data.GreenWallet
-import com.blockstream.common.events.Events
 import com.blockstream.common.looks.wallet.WalletListLook
 import com.blockstream.common.models.wallets.WalletsViewModel
 import com.blockstream.common.models.wallets.WalletsViewModelAbstract
@@ -90,7 +89,7 @@ fun WalletsScreen(
             )
         )
     }, onLightningShortcutDelete = {
-        viewModel.postEvent(Events.AskRemoveLightningShortcut(wallet = it))
+        // viewModel.postEvent(Events.AskRemoveLightningShortcut(wallet = it))
     }, onWalletDelete = {
         viewModel.postEvent(NavigateDestinations.DeleteWallet(it))
     }, onWalletRename = {