Skip to content

Commit 76c6765

Browse files
committed
Fixed trade result loading indicator not showing reliably.
1 parent 968a3ed commit 76c6765

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

src/Sidekick.Modules.Trade/Trade/Bulk/BulkResult.razor

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@
1111
<AlertError>@TradeService.ResultError</AlertError>
1212
}
1313

14+
@if (TradeService.IsLoading)
15+
{
16+
return;
17+
}
18+
1419
@if (TradeService.BulkTradeResult.Offers.Count == 0)
1520
{
1621
<AlertInfo>@Resources["NoResults"]</AlertInfo>
17-
return;
1822
}
1923

2024
@foreach (var offer in TradeService.BulkTradeResult.Offers)
@@ -41,11 +45,6 @@
4145
</div>
4246
}
4347

44-
@if (TradeService.IsLoading)
45-
{
46-
<AppLoading/>
47-
}
48-
4948
@implements IDisposable
5049

5150
@inject IStringLocalizer<TradeResources> Resources

src/Sidekick.Modules.Trade/Trade/Items/ItemsResult.razor

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919

2020
@if (TradeService.IsLoading)
2121
{
22-
<AppLoading/>
22+
return;
2323
}
24-
else if (TradeService.TradeItems.Count == 0)
24+
25+
@if (TradeService.TradeItems.Count == 0)
2526
{
2627
<AlertInfo>@Resources["NoResults"]</AlertInfo>
2728
}

src/Sidekick.Modules.Trade/Trade/TradeResult.razor

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22
@using Sidekick.Modules.Trade.Trade.Bulk
33
@using Sidekick.Modules.Trade.Trade.Items
44

5-
@if (TradeService.ItemTradeResult == null && TradeService.BulkTradeResult == null)
5+
<BulkResult/>
6+
<ItemsResult/>
7+
8+
@if (TradeService.IsLoading)
9+
{
10+
<AppLoading/>
11+
}
12+
else if (TradeService.ItemTradeResult == null && TradeService.BulkTradeResult == null)
613
{
714
<AlertInfo Flat="true">@Resources["TradeInstructions"]</AlertInfo>
815
}
916

10-
<BulkResult/>
11-
<ItemsResult/>
12-
1317
@implements IDisposable
1418

1519
@inject IStringLocalizer<TradeResources> Resources

0 commit comments

Comments
 (0)