From 3260acbcc7e907fa9c9c60d0582bf974031f917b Mon Sep 17 00:00:00 2001
From: Arc <33088785+arcbtc@users.noreply.github.com>
Date: Mon, 18 Sep 2023 19:41:35 +0100
Subject: [PATCH] Revert "do not show deleted wallets (#1942)" (#1947)

This reverts commit 1ee2d53069c6e3e8287b6bd3e22d67c42fdbf723.
---
 lnbits/core/crud.py | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/lnbits/core/crud.py b/lnbits/core/crud.py
index e22c1675b..ae9844776 100644
--- a/lnbits/core/crud.py
+++ b/lnbits/core/crud.py
@@ -61,37 +61,25 @@ async def get_account(
     return User(**row) if row else None
 
 
-async def get_user(
-    user_id: str,
-    conn: Optional[Connection] = None,
-    include_deleted_wallets: Optional[bool] = False,
-) -> Optional[User]:
+async def get_user(user_id: str, conn: Optional[Connection] = None) -> Optional[User]:
     user = await (conn or db).fetchone(
         "SELECT id, email FROM accounts WHERE id = ?", (user_id,)
     )
 
     if user:
-        clauses = ["user = ?"]
-        values: List[Any] = [user_id]
-
-        if not include_deleted_wallets:
-            clauses.append("deleted = ?")
-            values.append(False)
-
-        where = "WHERE " + " AND ".join(clauses) if clauses else ""
         extensions = await (conn or db).fetchall(
             """SELECT extension FROM extensions WHERE "user" = ? AND active""",
             (user_id,),
         )
         wallets = await (conn or db).fetchall(
-            f"""
+            """
             SELECT *, COALESCE((
                 SELECT balance FROM balances WHERE wallet = wallets.id
             ), 0) AS balance_msat
             FROM wallets
-            {where}
+            WHERE "user" = ?
             """,
-            tuple(values),
+            (user_id,),
         )
     else:
         return None