Merge pull request #39 from KristiforMilchev/development

Removing lose methods causing the app to crash due to null reference …

Author: KristiforMilchev

Data/ContractService.cs

@@ -300,6 +300,9 @@ private static async Task<decimal> GetImportedData(NetworkSettings network, Toke
 
         private static async Task<List<Token>> GetListedTokens(List<ListedToken> listedTokenData, List<Token> tokens, NetworkSettings network)
         {
+            if (listedTokenData == null)
+                return tokens;
+
             foreach(var token in listedTokenData)
             {
                 var currentToken = await Utilities.GetRequest<Token>($"https://raw.githubusercontent.com/KristiforMilchev/LInksync-Cold-Storage-Wallet/main/Models/Tokens/{token.name}/token.json");

MauiProgram.cs

@@ -56,6 +56,7 @@ public static async Task<MauiApp> CreateMauiApp()
             });
 
         builder.Services.AddMauiBlazorWebView();
+        builder.Services.AddLogging();
         #if DEBUG
             builder.Services.AddBlazorWebViewDeveloperTools();
         #endif

Pages/Landing.razor

@@ -517,8 +517,12 @@
     {
         await  InvokeAsync( async () =>
         {
-            Tokens = await Authenication.GetSupportedTokens(SelectedNetwork.Id); //Get All tokens and their balance
-            StateHasChanged();
+            if(SelectedNetwork != null)
+            {
+                Tokens = await Authenication.GetSupportedTokens(SelectedNetwork.Id); //Get All tokens and their balance
+                StateHasChanged();
+            }
+
         });
 
 

Services/Implementation/Utilities.cs

@@ -1,12 +1,7 @@
 using Newtonsoft.Json;
 using SYNCWallet.Models;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace SYNCWallet.Services.Implementation
 {
@@ -24,8 +19,8 @@ public async Task<List<NetworkSettings>> SetupNetworks()
 
                 var filesContent = File.ReadAllText($"{GetOsSavePath()}/LocalNetworks.json");
                 var convertedNetworkList = JsonConvert.DeserializeObject<List<NetworkSettings>>(filesContent);
-
-                whiteListedNetworks.AddRange(convertedNetworkList);
+                if(convertedNetworkList != null)
+                    whiteListedNetworks.AddRange(convertedNetworkList);
                 return whiteListedNetworks;
             }