Claim flow fix

michielpost · Mar 19, 2024 · caad0fb · caad0fb
1 parent 2814867
commit caad0fb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/ArweaveBlazor/ArweaveBlazor.csproj b/src/ArweaveBlazor/ArweaveBlazor.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.3" />
   </ItemGroup>
 
 </Project>
diff --git a/src/aoWebWallet/Pages/Wallets.razor.cs b/src/aoWebWallet/Pages/Wallets.razor.cs
@@ -16,7 +16,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         {
             if (firstRender)
             {
-                BindingContext.CheckHasArConnectExtension();
+                await BindingContext.CheckHasArConnectExtension();
 
                 await BindingContext.LoadWalletList();
                 await BindingContext.LoadTokenList();
@@ -25,12 +25,12 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
             await base.OnAfterRenderAsync(firstRender);
         }
 
-        protected override async Task LoadDataAsync()
-        {
+        //protected override async Task LoadDataAsync()
+        //{
 
 
-            //BindingContext.LoadStats();
-        }
+        //    //BindingContext.LoadStats();
+        //}
 
     }
 }
diff --git a/src/aoWebWallet/ViewModels/MainViewModel.cs b/src/aoWebWallet/ViewModels/MainViewModel.cs
@@ -437,7 +437,7 @@ public async Task Claim2()
             if (UserSettings != null)
             {
                 var tx = await Claim(2);
-                if (tx != null)
+                if (tx != null && !string.IsNullOrEmpty(tx.Id))
                 {
                     UserSettings.Claimed2 = true;
                     await storageService.SaveUserSettings(UserSettings);
@@ -459,7 +459,7 @@ public async Task Claim3()
             if (UserSettings != null)
             {
                 var tx = await Claim(3);
-                if (tx != null)
+                if (tx != null && !string.IsNullOrEmpty(tx.Id))
                 {
                     UserSettings.Claimed3 = true;
                     await storageService.SaveUserSettings(UserSettings);

diff --git a/src/aoWebWallet/aoWebWallet.csproj b/src/aoWebWallet/aoWebWallet.csproj
@@ -16,8 +16,8 @@
 		<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
 		<PackageReference Include="BlazorWasmPreRendering.Build" Version="3.1.0-preview.4" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.2" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.3" PrivateAssets="all" />
 	</ItemGroup>
 
 	<ItemGroup>