Null pointer exception when invalid metadata from btcpay (#352)

Co-authored-by: José A.P <[email protected]>
Elenpay · Dec 8, 2023 · bd6d840 · bd6d840
1 parent 96dcd2b
commit bd6d840
Showing 1 changed file with 6 additions and 14 deletions.
diff --git a/src/Pages/Withdrawals.razor b/src/Pages/Withdrawals.razor
@@ -586,23 +586,15 @@
     {
         if (walletWithdrawalRequest.RequestMetadata != null)
         {
-            try
+            var requestMetadata = JsonConvert.DeserializeObject<Dictionary<string, string>>(walletWithdrawalRequest.RequestMetadata);
+            if (requestMetadata != null && requestMetadata.TryGetValue("userName", out var userName))
             {
-                var requestMetadata = JsonConvert.DeserializeObject<Dictionary<string, string>>(walletWithdrawalRequest.RequestMetadata);
-
-                if (requestMetadata.TryGetValue("userName", out var userName))
+                if (ValidationHelper.IsValidEmail(userName))
                 {
-                    if (ValidationHelper.IsValidEmail(userName))
-                    {
-                        int atIndex = userName.IndexOf('@');
-                        return atIndex >= 0 ? userName.Substring(0, atIndex) : userName;
-                    }
-                    return userName;
+                    int atIndex = userName.IndexOf('@');
+                    return atIndex >= 0 ? userName.Substring(0, atIndex) : userName;
                 }
-            }
-            catch (JsonReaderException ex)
-            {
-                Console.WriteLine("Invalid JSON: " + ex.Message);
+                return userName;
             }
         }