From 3fd66f38dad185c9b895beab66118cc7e2b1a2f4 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Sat, 27 Nov 2021 12:42:19 +0100
Subject: [PATCH 1/5] rename endpoint to avoid collision

---
 lnbits/extensions/usermanager/views_api.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lnbits/extensions/usermanager/views_api.py b/lnbits/extensions/usermanager/views_api.py
index 26b9874b..1439b682 100644
--- a/lnbits/extensions/usermanager/views_api.py
+++ b/lnbits/extensions/usermanager/views_api.py
@@ -23,7 +23,7 @@ from .crud import (
 )
 from .models import CreateUserData, CreateUserWallet
 
-### Users
+# Users
 
 
 @usermanager_ext.get("/api/v1/users", status_code=HTTPStatus.OK)
@@ -72,7 +72,7 @@ async def api_usermanager_users_delete(
     raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
-###Activate Extension
+# Activate Extension
 
 
 @usermanager_ext.post("/api/v1/extensions")
@@ -88,7 +88,7 @@ async def api_usermanager_activate_extension(
     return {"extension": "updated"}
 
 
-###Wallets
+# Wallets
 
 
 @usermanager_ext.post("/api/v1/wallets")
@@ -107,7 +107,7 @@ async def api_usermanager_wallets(wallet: WalletTypeInfo = Depends(get_key_type)
     return [wallet.dict() for wallet in await get_usermanager_wallets(admin_id)]
 
 
-@usermanager_ext.get("/api/v1/wallets/{wallet_id}")
+@usermanager_ext.get("/api/v1/transactions/{wallet_id}")
 async def api_usermanager_wallet_transactions(
     wallet_id, wallet: WalletTypeInfo = Depends(get_key_type)
 ):

From 2612e6064718dcab9049cf274ef9243dec7193e7 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Sat, 27 Nov 2021 12:43:14 +0100
Subject: [PATCH 2/5] annotation for optional attributes

---
 lnbits/extensions/usermanager/models.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/usermanager/models.py b/lnbits/extensions/usermanager/models.py
index e65bdb52..67facec6 100644
--- a/lnbits/extensions/usermanager/models.py
+++ b/lnbits/extensions/usermanager/models.py
@@ -2,6 +2,7 @@ from sqlite3 import Row
 
 from fastapi.param_functions import Query
 from pydantic import BaseModel
+from typing import Optional
 
 
 class CreateUserData(BaseModel):
@@ -22,8 +23,8 @@ class Users(BaseModel):
     id: str
     name: str
     admin: str
-    email: str
-    password: str
+    email: Optional[str] = None
+    password: Optional[str] = None
 
 
 class Wallets(BaseModel):

From 9b58bfe06a940aee9b101182aa5fb39d21474b06 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Sat, 27 Nov 2021 12:54:01 +0100
Subject: [PATCH 3/5] remove trio_typing

---
 mypy.ini | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 mypy.ini

diff --git a/mypy.ini b/mypy.ini
deleted file mode 100644
index b991c7cc..00000000
--- a/mypy.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[mypy]
-plugins = trio_typing.plugin

From ad3942f844fc0657964598b5c12d2c50ad0a40be Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Sat, 27 Nov 2021 13:01:12 +0100
Subject: [PATCH 4/5] remove type comment

---
 lnbits/jinja2_templating.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnbits/jinja2_templating.py b/lnbits/jinja2_templating.py
index f74f05c0..5abcd0bf 100644
--- a/lnbits/jinja2_templating.py
+++ b/lnbits/jinja2_templating.py
@@ -23,7 +23,7 @@ class Jinja2Templates(templating.Jinja2Templates):
     def get_environment(self, loader: "jinja2.BaseLoader") -> "jinja2.Environment":
         @jinja2.contextfunction
         def url_for(context: dict, name: str, **path_params: typing.Any) -> str:
-            request: Request = context["request"]  # type: starlette.requests.Request
+            request: Request = context["request"]
             return request.app.url_path_for(name, **path_params)
 
         def url_params_update(init: QueryParams, **new: typing.Any) -> QueryParams:

From b178d9a38d27730a294130c9b271e36d0faa573e Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Sat, 27 Nov 2021 13:11:29 +0100
Subject: [PATCH 5/5] readd mypy.ini

---
 mypy.ini | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 mypy.ini

diff --git a/mypy.ini b/mypy.ini
new file mode 100644
index 00000000..f8b1844b
--- /dev/null
+++ b/mypy.ini
@@ -0,0 +1 @@
+[mypy]