Skip to content

Fixed trade result loading indicator not showing reliably #854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 4, 2025
+16 −12
Merged

Fixed trade result loading indicator not showing reliably #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/Sidekick.Modules.Trade/Trade/Bulk/BulkResult.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@
<AlertError>@TradeService.ResultError</AlertError>
}

@if (TradeService.IsLoading)
{
return;
}

@if (TradeService.BulkTradeResult.Offers.Count == 0)
{
<AlertInfo>@Resources["NoResults"]</AlertInfo>
return;
}

@foreach (var offer in TradeService.BulkTradeResult.Offers)
Expand All @@ -41,11 +45,6 @@
</div>
}

@if (TradeService.IsLoading)
{
<AppLoading/>
}

@implements IDisposable

@inject IStringLocalizer<TradeResources> Resources
Expand Down
5 changes: 3 additions & 2 deletions src/Sidekick.Modules.Trade/Trade/Items/ItemsResult.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@

@if (TradeService.IsLoading)
{
<AppLoading/>
return;
}
else if (TradeService.TradeItems.Count == 0)

@if (TradeService.TradeItems.Count == 0)
{
<AlertInfo>@Resources["NoResults"]</AlertInfo>
}
Expand Down
12 changes: 8 additions & 4 deletions src/Sidekick.Modules.Trade/Trade/TradeResult.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@
@using Sidekick.Modules.Trade.Trade.Bulk
@using Sidekick.Modules.Trade.Trade.Items

@if (TradeService.ItemTradeResult == null && TradeService.BulkTradeResult == null)
<BulkResult/>
<ItemsResult/>

@if (TradeService.IsLoading)
{
<AppLoading/>
}
else if (TradeService.ItemTradeResult == null && TradeService.BulkTradeResult == null)
{
<AlertInfo Flat="true">@Resources["TradeInstructions"]</AlertInfo>
}

<BulkResult/>
<ItemsResult/>

@implements IDisposable

@inject IStringLocalizer<TradeResources> Resources
Expand Down
Loading