Merge branch 'kub-stage' into production

src/BackOffice/BackOffice.csproj

@@ -138,7 +138,7 @@
     
     <!-- CMS Protobuf NuGet package (used for both local dev and Docker builds) -->
     <ItemGroup>
-        <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.183" />
+        <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.189" />
     </ItemGroup>
     
     <!-- ============================================================ -->

src/BackOffice/Common/Configure/ConfigureService.cs

@@ -30,7 +30,7 @@ using CMSMicroservice.Protobuf.Protos.SitePage;
 using CMSMicroservice.Protobuf.Protos.SitePageSettings;
 using CMSMicroservice.Protobuf.Protos.UserContract;
 using CMSMicroservice.Protobuf.Protos.UserWallet;
-using CMSMicroservice.Protobuf.Protos.UserWalletChangeLog;
+using CMSMicroservice.Protobuf.Protos.UserWalletHistory;
 using BackOffice.Common.Utilities;
 using BackOffice.Services.DiscountProduct;
 using BackOffice.Services.DiscountCategory;
@@ -167,7 +167,7 @@ public static class ConfigureServices
 
         // User Wallet Services
         services.AddTransient(sp => new UserWalletContract.UserWalletContractClient(sp.GetRequiredService<CallInvoker>()));
-        services.AddTransient(sp => new UserWalletChangeLogContract.UserWalletChangeLogContractClient(sp.GetRequiredService<CallInvoker>()));
+        services.AddTransient(sp => new UserWalletHistoryContract.UserWalletHistoryContractClient(sp.GetRequiredService<CallInvoker>()));
 
         return services;
     }

src/BackOffice/NuGet.config

@@ -2,6 +2,8 @@
 <configuration>
   <packageSources>
     <clear />
+    <!-- Local packages (dev builds) -->
+    <add key="Local" value="/home/masoud/Apps/project/FourSat/nupkg" />
     <!-- Nexus (hosts FourSat packages + proxies nuget.org) -->
     <add key="Nexus" value="http://194.5.195.53:32081/repository/nuget-all/index.json" allowInsecureConnections="true" />
   </packageSources>

src/BackOffice/Pages/AutoComplete/PackageSelect.razor

@@ -0,0 +1,16 @@
+@using CMSMicroservice.Protobuf.Protos.Package
+
+<MudSelect T="long?" 
+           Label="@Label" 
+           Value="@SelectedPackageId"
+           ValueChanged="OnValueChanged"
+           Variant="Variant.Outlined" 
+           Margin="Margin.Dense"
+           Clearable="true"
+           Style="min-width: 160px;">
+    <MudSelectItem T="long?" Value="@((long?)null)">همه پکیج‌ها</MudSelectItem>
+    @foreach (var pkg in _packages)
+    {
+        <MudSelectItem T="long?" Value="@((long?)pkg.Id)">@pkg.Title</MudSelectItem>
+    }
+</MudSelect>

src/BackOffice/Pages/AutoComplete/PackageSelect.razor.cs

@@ -0,0 +1,46 @@
+using CMSMicroservice.Protobuf.Protos.Package;
+using Microsoft.AspNetCore.Components;
+
+namespace BackOffice.Pages.AutoComplete;
+
+public partial class PackageSelect
+{
+    [Inject] public PackageContract.PackageContractClient PackageClient { get; set; }
+
+    [Parameter] public string Label { get; set; } = "پکیج";
+    [Parameter] public long? SelectedPackageId { get; set; }
+    [Parameter] public EventCallback<long?> SelectedPackageIdChanged { get; set; }
+
+    private List<GetAllPackageByFilterResponseModel> _packages = new();
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadPackages();
+    }
+
+    private async Task LoadPackages()
+    {
+        try
+        {
+            var request = new GetAllPackageByFilterRequest
+            {
+                PaginationState = new() { PageNumber = 1, PageSize = 100 },
+                Filter = new()
+            };
+
+            var result = await PackageClient.GetAllPackageByFilterAsync(request);
+            _packages = result.Models?.OrderBy(p => p.SortOrder).ToList() 
+                        ?? new List<GetAllPackageByFilterResponseModel>();
+        }
+        catch
+        {
+            _packages = new List<GetAllPackageByFilterResponseModel>();
+        }
+    }
+
+    private async Task OnValueChanged(long? value)
+    {
+        SelectedPackageId = value;
+        await SelectedPackageIdChanged.InvokeAsync(value);
+    }
+}

src/BackOffice/Pages/Club/ClubFeaturesPage.razor

@@ -11,6 +11,11 @@
 <div>
     <MudText Typo="Typo.h5" Class="mb-3">فیچرهای باشگاه</MudText>
 
+    @* ── G9: راهنمای ماتریس فیچر (Q28) ── *@
+    <MudAlert Severity="Severity.Info" Variant="Variant.Text" Dense="true" Class="mb-3" Icon="@Icons.Material.Filled.Info">
+        فیچرهای تیک‌خورده برای خریداران این پکیج فعال می‌شود. تغییر فیچرها روی کاربران فعلی بلافاصله اعمال می‌شود.
+    </MudAlert>
+
     <MudTabs Elevation="0" Rounded="true" Border="true" ApplyEffectsToContainer="true"
              PanelClass="pt-4" @bind-ActivePanelIndex="_activeTab">
 

src/BackOffice/Pages/Club/ClubMembers.razor

@@ -9,6 +9,11 @@
 <div>
     <MudText Typo="Typo.h4" Class="mb-4">مدیریت اعضای باشگاه</MudText>
 
+    @* ── G13: راهنمای اعضای باشگاه (Q28) ── *@
+    <MudAlert Severity="Severity.Info" Variant="Variant.Text" Dense="true" Class="mb-3" Icon="@Icons.Material.Filled.Info">
+        فیلتر بر اساس آخرین پکیج خریداری‌شده اعمال می‌شود. هر کاربر می‌تواند چندین دوره پکیج داشته باشد.
+    </MudAlert>
+
     <MudDataGrid T="ClubMembershipModel" 
                  ServerData="@(new Func<GridState<ClubMembershipModel>, Task<GridData<ClubMembershipModel>>>(ServerReload))"
                  Hover="true" 

src/BackOffice/Pages/Club/Components/ActivateClubDialog.razor

@@ -1,4 +1,5 @@
 @using CMSMicroservice.Protobuf.Protos.ClubMembership
+@using CMSMicroservice.Protobuf.Protos.Package
 @using BackOffice.Pages.AutoComplete
 
 <MudDialog>
@@ -7,23 +8,32 @@
             <MudStack Spacing="3">
                 <UserAutoComplete Label="انتخاب کاربر" @bind-SelectedUserId="_model.UserId" />
 
-                <MudNumericField @bind-Value="_model.PackageId" 
-                                Label="شناسه پکیج" 
-                                Required="true"
-                                RequiredError="شناسه پکیج الزامی است"
-                                Variant="Variant.Outlined" />
-
-                <MudNumericField @bind-Value="_model.DurationMonths" 
-                                Label="مدت زمان (ماه)" 
-                                Required="true"
-                                RequiredError="مدت زمان الزامی است"
-                                Min="1"
-                                Max="12"
-                                Variant="Variant.Outlined" />
+                @if (_isLoadingPackages)
+                {
+                    <MudSkeleton SkeletonType="SkeletonType.Rectangle" Height="56px" />
+                }
+                else
+                {
+                    <MudSelect T="long" @bind-Value="_model.PackageId"
+                               Label="انتخاب پکیج"
+                               Required="true"
+                               RequiredError="انتخاب پکیج الزامی است"
+                               Variant="Variant.Outlined"
+                               AnchorOrigin="Origin.BottomCenter">
+                        @foreach (var pkg in _packages)
+                        {
+                            <MudSelectItem T="long" Value="pkg.Id">
+                                @pkg.Title — @($"{pkg.Price:N0}") ریال
+                            </MudSelectItem>
+                        }
+                    </MudSelect>
+                }
 
                 <MudAlert Severity="Severity.Info" Dense="true">
                     <MudText Typo="Typo.body2">
                         با تایید، عضویت باشگاه برای کاربر فعال می‌شود.
+                        <br/>
+                        <small>عضویت باشگاه بدون محدودیت زمانی است.</small>
                     </MudText>
                 </MudAlert>
             </MudStack>
@@ -34,7 +44,7 @@
         <MudButton Color="Color.Success" 
                    Variant="Variant.Filled" 
                    OnClick="Submit"
-                   Disabled="@(!_formValid || _isSubmitting)">
+                   Disabled="@(!_formValid || _isSubmitting || _isLoadingPackages)">
             @if (_isSubmitting)
             {
                 <MudProgressCircular Size="Size.Small" Indeterminate="true" />
@@ -51,12 +61,49 @@
 @code {
     [CascadingParameter] IMudDialogInstance MudDialog { get; set; }
     [Inject] public ClubMembershipContract.ClubMembershipContractClient ClubContract { get; set; }
+    [Inject] public PackageContract.PackageContractClient PackageClient { get; set; }
 
     private MudForm _form;
     private bool _formValid;
     private bool _isSubmitting;
+    private bool _isLoadingPackages = true;
+    private List<GetAllPackageByFilterResponseModel> _packages = new();
     private ActivateModel _model = new();
 
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadPackages();
+    }
+
+    private async Task LoadPackages()
+    {
+        _isLoadingPackages = true;
+        try
+        {
+            var request = new GetAllPackageByFilterRequest
+            {
+                PaginationState = new CMSMicroservice.Protobuf.Protos.PaginationState
+                {
+                    PageNumber = 1,
+                    PageSize = 50
+                }
+            };
+            var result = await PackageClient.GetAllPackageByFilterAsync(request);
+            if (result?.Models != null)
+            {
+                _packages = result.Models.ToList();
+            }
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"خطا در بارگذاری پکیج‌ها: {ex.Message}", Severity.Error);
+        }
+        finally
+        {
+            _isLoadingPackages = false;
+        }
+    }
+
     private void Cancel() => MudDialog.Cancel();
 
     private async Task Submit()
@@ -70,6 +117,12 @@
             return;
         }
 
+        if (_model.PackageId <= 0)
+        {
+            Snackbar.Add("لطفاً پکیج را انتخاب کنید.", Severity.Warning);
+            return;
+        }
+
         _isSubmitting = true;
         try
         {
@@ -77,12 +130,12 @@
             {
                 UserId = _model.UserId.Value,
                 PackageId = _model.PackageId,
-                DurationMonths = _model.DurationMonths
+                ForceActivation = true
             };
 
             var response = await ClubContract.ActivateClubMembershipAsync(request);
             
-            Snackbar.Add($"عضویت با موفقیت فعال شد.", Severity.Success);
+            Snackbar.Add("عضویت با موفقیت فعال شد.", Severity.Success);
             MudDialog.Close(DialogResult.Ok(true));
         }
         catch (Exception ex)
@@ -99,6 +152,5 @@
     {
         public long? UserId { get; set; }
         public long PackageId { get; set; }
-        public int DurationMonths { get; set; } = 1;
     }
 }

src/BackOffice/Pages/Commission/Dashboard.razor

@@ -8,6 +8,11 @@
 <div>
     <MudText Typo="Typo.h4" Class="mb-4">داشبورد کمیسیون</MudText>
 
+    @* ── G11: راهنمای کمیسیون (Q28) ── *@
+    <MudAlert Severity="Severity.Info" Variant="Variant.Text" Dense="true" Class="mb-3" Icon="@Icons.Material.Filled.Info">
+        هر پکیج Pool پورسانت مستقل دارد. مبالغ ActivationFee به Pool پکیج مربوطه واریز می‌شود.
+    </MudAlert>
+
     @if (_isLoading)
     {
         <MudProgressCircular Color="Color.Primary" Indeterminate="true" />

src/BackOffice/Pages/Commission/Models/WithdrawalRequestModel.cs

@@ -19,4 +19,5 @@ public class WithdrawalRequestModel
     public string? BankTrackingCode { get; set; }
     public string? PaymentFailureReason { get; set; }
     public string? IbanNumber { get; set; }
+    public string? PackageName { get; set; }
 }

src/BackOffice/Pages/Commission/UserPayouts.razor

@@ -9,6 +9,11 @@
 <div>
     <MudText Typo="Typo.h4" Class="mb-4"> پرداخت های کاربران</MudText>
 
+    @* ── G11b: راهنمای پرداخت‌ها (Q28) ── *@
+    <MudAlert Severity="Severity.Info" Variant="Variant.Text" Dense="true" Class="mb-3" Icon="@Icons.Material.Filled.Info">
+        پاداش‌ها بر اساس هر پکیج جداگانه محاسبه می‌شود. ستون «پکیج» نشان‌دهنده پکیج منبع پاداش است.
+    </MudAlert>
+
     <MudDataGrid T="UserCommissionPayoutModel" 
                  ServerData="@(new Func<GridState<UserCommissionPayoutModel>, Task<GridData<UserCommissionPayoutModel>>>(ServerReload))"
                  Hover="true" 
@@ -36,6 +41,8 @@
                     <MudSelectItem T="int?" Value="@((int?)4)">شکست خورده</MudSelectItem>
                     <MudSelectItem T="int?" Value="@((int?)5)">لغو شده</MudSelectItem>
                 </MudSelect>
+                <PackageSelect Label="پکیج"
+                              @bind-SelectedPackageId="_filterPackageId" />
                 <MudButton Variant="Variant.Filled" 
                           Color="Color.Primary" 
                           OnClick="ApplyFilter"
@@ -64,6 +71,14 @@
                 </CellTemplate>
             </PropertyColumn>
 
+            <PropertyColumn Property="x => x.PackageTitle" Title="پکیج">
+                <CellTemplate>
+                    <MudChip T="string" Color="Color.Tertiary" Size="Size.Small">
+                        @(string.IsNullOrEmpty(context.Item.PackageTitle) ? "-" : context.Item.PackageTitle)
+                    </MudChip>
+                </CellTemplate>
+            </PropertyColumn>
+
             <PropertyColumn Property="x => x.BalancesEarned" Title="بالانس‌ها">
                 <CellTemplate>
                     <MudChip T="string" Color="Color.Info" Size="Size.Small">

src/BackOffice/Pages/Commission/UserPayouts.razor.cs

@@ -17,6 +17,7 @@ public partial class UserPayouts
     private long? _filterUserId;
     private long? _filterWeekDefinitionId;
     private int? _filterStatus;
+    private long? _filterPackageId;
 
     private async Task<GridData<UserCommissionPayoutModel>> ServerReload(GridState<UserCommissionPayoutModel> state)
     {
@@ -44,6 +45,11 @@ public partial class UserPayouts
                 request.Status = _filterStatus.Value;
             }
 
+            if (_filterPackageId.HasValue && _filterPackageId.Value > 0)
+            {
+                request.PackageId = _filterPackageId.Value;
+            }
+
             var result = await CommissionContract.GetUserCommissionPayoutsAsync(request);
 
             if (result?.Models != null && result.Models.Any())

src/BackOffice/Pages/Commission/WithdrawalRequests.razor.cs

@@ -87,7 +87,8 @@ public partial class WithdrawalRequests
             BankReferenceId = grpcModel.BankReferenceId,
             BankTrackingCode = grpcModel.BankTrackingCode,
             PaymentFailureReason = grpcModel.PaymentFailureReason,
-            IbanNumber = grpcModel.IbanNumber
+            IbanNumber = grpcModel.IbanNumber,
+            PackageName = grpcModel.PackageName
         };
     }
 
@@ -269,7 +270,7 @@ public partial class WithdrawalRequests
             }
 
             var sb = new StringBuilder();
-            sb.AppendLine("شناسه,کاربر,نام کاربر,مبلغ,وضعیت,روش,شماره شبا,تاریخ درخواست,تاریخ پردازش,شماره مرجع بانکی");
+            sb.AppendLine("شناسه,کاربر,نام کاربر,پکیج,مبلغ,وضعیت,روش,شماره شبا,تاریخ درخواست,تاریخ پردازش,شماره مرجع بانکی");
 
             foreach (var r in result.Models)
             {
@@ -278,6 +279,7 @@ public partial class WithdrawalRequests
                     mapped.Id,
                     mapped.UserId,
                     EscapeCsv(mapped.UserName),
+                    EscapeCsv(mapped.PackageName ?? "-"),
                     mapped.Amount,
                     EscapeCsv(GetStatusText(mapped.Status)),
                     EscapeCsv(GetMethodText(mapped.Method)),

src/BackOffice/Pages/Network/BalancesReport.razor

@@ -33,10 +33,8 @@
                                      Min="0" />
                 </MudItem>
                 <MudItem xs="12" md="2">
-                    <MudNumericField @bind-Value="_maxBalance" 
-                                     Label="حداکثر موجودی" 
-                                     Variant="Variant.Outlined"
-                                     Min="0" />
+                    <PackageSelect Label="پکیج"
+                                   @bind-SelectedPackageId="_filterPackageId" />
                 </MudItem>
                 <MudItem xs="12" md="2" Class="d-flex align-center">
                     <MudButton Variant="Variant.Filled" 
@@ -72,6 +70,14 @@
                     <PropertyColumn Property="x => x.UserFullName" Title="نام کاربر" />
                     <PropertyColumn Property="x => x.WeekDisplayName" Title="هفته" />
                     
+                    <PropertyColumn Property="x => x.PackageTitle" Title="پکیج">
+                        <CellTemplate>
+                            <MudChip T="string" Color="Color.Tertiary" Size="Size.Small">
+                                @(string.IsNullOrEmpty(context.Item.PackageTitle) ? "-" : context.Item.PackageTitle)
+                            </MudChip>
+                        </CellTemplate>
+                    </PropertyColumn>
+                    
                     <TemplateColumn Title="چپ (جدید + قبلی = مجموع)">
                         <CellTemplate>
                             <MudStack Row="true" Spacing="1" AlignItems="AlignItems.Center">
@@ -193,6 +199,7 @@
 private MudDataGrid <UserWeeklyBalanceModel> _grid { get; set; }
     private long? _filterUserId = null;
     private long? _filterWeekDefinitionId = null;
+    private long? _filterPackageId = null;
     private int? _minBalance = null;
     private int? _maxBalance = null;
     private bool _onlyActive = false;
@@ -222,6 +229,11 @@ private MudDataGrid <UserWeeklyBalanceModel> _grid { get; set; }
                 request.WeekDefinitionId = _filterWeekDefinitionId.Value;
             }
 
+            if (_filterPackageId.HasValue && _filterPackageId.Value > 0)
+            {
+                request.PackageId = _filterPackageId.Value;
+            }
+
             var response = await CommissionClient.GetUserWeeklyBalancesAsync(request);
 
             var items = response.Models.Select(b => new UserWeeklyBalanceModel
@@ -238,7 +250,8 @@ private MudDataGrid <UserWeeklyBalanceModel> _grid { get; set; }
                 MatchedBalance = b.TotalBalances,
                 PoolContribution = b.WeeklyPoolContribution,
                 CalculatedAt = b.CalculatedAt?.ToDateTime(),
-                IsExpired = b.IsExpired
+                IsExpired = b.IsExpired,
+                PackageTitle = b.PackageTitle
             }).ToList();
 
             // Apply balance range filter if specified
@@ -308,5 +321,6 @@ private MudDataGrid <UserWeeklyBalanceModel> _grid { get; set; }
         public long PoolContribution { get; set; }
         public DateTime? CalculatedAt { get; set; }
         public bool IsExpired { get; set; }
+        public string PackageTitle { get; set; } = string.Empty;
     }
 }

src/BackOffice/Pages/Network/Components/ChangeParentDialog.razor

@@ -0,0 +1,78 @@
+@using CMSMicroservice.Protobuf.Protos.NetworkMembership
+
+<MudDialog>
+    <TitleContent>
+        <MudText Typo="Typo.h6">
+            <MudIcon Icon="@Icons.Material.Filled.SwapHoriz" Class="ml-1" />
+            تغییر والد در شبکه
+        </MudText>
+    </TitleContent>
+    <DialogContent>
+        <MudAlert Severity="Severity.Warning" Dense="true" Class="mb-4">
+            ⚠️ این عملیات حساس است و ساختار درخت شبکه را تغییر می‌دهد.
+            تاریخچه تغییر ثبت خواهد شد.
+        </MudAlert>
+
+        <MudForm @ref="_form">
+            <MudStack Spacing="3">
+                <MudTextField T="string" 
+                              Label="کاربر فعلی" 
+                              Value="@UserDisplayName"
+                              ReadOnly="true"
+                              Variant="Variant.Outlined"
+                              Adornment="Adornment.Start"
+                              AdornmentIcon="@Icons.Material.Filled.Person" />
+
+                <MudNumericField T="long" 
+                                 @bind-Value="_newParentId"
+                                 Label="شناسه والد جدید"
+                                 Required="true"
+                                 RequiredError="شناسه والد جدید الزامی است"
+                                 Variant="Variant.Outlined"
+                                 Adornment="Adornment.Start"
+                                 AdornmentIcon="@Icons.Material.Filled.PersonSearch"
+                                 Min="1" />
+
+                <MudSelect T="int" 
+                           @bind-Value="_newLeg"
+                           Label="ساق جدید"
+                           Required="true"
+                           Variant="Variant.Outlined"
+                           Adornment="Adornment.Start"
+                           AdornmentIcon="@Icons.Material.Filled.AccountTree">
+                    <MudSelectItem T="int" Value="0">چپ (تیم اول)</MudSelectItem>
+                    <MudSelectItem T="int" Value="1">راست (تیم دوم)</MudSelectItem>
+                </MudSelect>
+
+                <MudTextField T="string"
+                              @bind-Value="_reason"
+                              Label="دلیل تغییر"
+                              Required="true"
+                              RequiredError="دلیل تغییر الزامی است"
+                              Variant="Variant.Outlined"
+                              Lines="3"
+                              Placeholder="دلیل جابجایی کاربر در شبکه را وارد کنید..."
+                              Adornment="Adornment.Start"
+                              AdornmentIcon="@Icons.Material.Filled.Description" />
+            </MudStack>
+        </MudForm>
+    </DialogContent>
+    <DialogActions>
+        <MudButton OnClick="Cancel" Color="Color.Default">انصراف</MudButton>
+        <MudButton OnClick="Submit" 
+                   Color="Color.Error" 
+                   Variant="Variant.Filled" 
+                   Disabled="_isSubmitting"
+                   StartIcon="@Icons.Material.Filled.SwapHoriz">
+            @if (_isSubmitting)
+            {
+                <MudProgressCircular Size="Size.Small" Indeterminate="true" Class="ml-2" />
+                <span>در حال انجام...</span>
+            }
+            else
+            {
+                <span>تغییر والد</span>
+            }
+        </MudButton>
+    </DialogActions>
+</MudDialog>

src/BackOffice/Pages/Network/Components/ChangeParentDialog.razor.cs

@@ -0,0 +1,66 @@
+using CMSMicroservice.Protobuf.Protos.NetworkMembership;
+using Microsoft.AspNetCore.Components;
+using MudBlazor;
+
+namespace BackOffice.Pages.Network.Components;
+
+public partial class ChangeParentDialog
+{
+    [Parameter] public long UserId { get; set; }
+    [Parameter] public string UserDisplayName { get; set; } = "";
+    [CascadingParameter] IMudDialogInstance MudDialog { get; set; } = default!;
+
+    [Inject] public NetworkMembershipContract.NetworkMembershipContractClient NetworkContract { get; set; } = default!;
+
+    private MudForm _form = default!;
+    private long _newParentId;
+    private int _newLeg;
+    private string _reason = "";
+    private bool _isSubmitting;
+
+    private async Task Submit()
+    {
+        await _form.Validate();
+        if (!_form.IsValid)
+            return;
+
+        if (_newParentId == UserId)
+        {
+            Snackbar.Add("والد جدید نمی‌تواند خود کاربر باشد.", Severity.Error);
+            return;
+        }
+
+        _isSubmitting = true;
+        StateHasChanged();
+
+        try
+        {
+            var request = new ChangeNetworkParentRequest
+            {
+                UserId = UserId,
+                NewParentId = _newParentId,
+                NewLeg = _newLeg,
+                Reason = _reason
+            };
+
+            await NetworkContract.ChangeNetworkParentAsync(request);
+            Snackbar.Add("والد کاربر با موفقیت تغییر کرد.", Severity.Success);
+            MudDialog.Close(DialogResult.Ok(true));
+        }
+        catch (Grpc.Core.RpcException ex)
+        {
+            Snackbar.Add($"خطا: {ex.Status.Detail}", Severity.Error);
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"خطا در تغییر والد: {ex.Message}", Severity.Error);
+        }
+        finally
+        {
+            _isSubmitting = false;
+            StateHasChanged();
+        }
+    }
+
+    private void Cancel() => MudDialog.Cancel();
+}

src/BackOffice/Pages/Network/UserNetworkInfo.razor

@@ -300,9 +300,9 @@
                         <MudSimpleTable Dense="true">
                             <tbody>
                                 <tr>
-                                    <td><strong>پکیج طلایی:</strong></td>
+                                    <td><strong>خرید پکیج:</strong></td>
                                     <td>
-                                        @if (_userInfo.HasPurchasedGoldenPackage)
+                                        @if (_userInfo.HasPurchasedPackage)
                                         {
                                             <MudChip T="string" Color="Color.Success" Size="Size.Small" Icon="@Icons.Material.Filled.CheckCircle">
                                                 خریداری شده
@@ -434,6 +434,12 @@
                                       OnClick="@(() => NavigationManager.NavigateTo($"/commission/payouts?userId={UserId}"))">
                                 پرداخت‌های کاربر
                             </MudButton>
+                            <MudButton Variant="Variant.Outlined"
+                                      Color="Color.Warning"
+                                      StartIcon="@Icons.Material.Filled.SwapHoriz"
+                                      OnClick="OpenChangeParentDialog">
+                                تغییر والد
+                            </MudButton>
                             <MudButton Variant="Variant.Outlined" 
                                       Color="Color.Secondary"
                                       StartIcon="@Icons.Material.Filled.Refresh"
@@ -537,4 +543,28 @@
             _ => "نامشخص"
         };
     }
+
+    private async Task OpenChangeParentDialog()
+    {
+        var displayName = $"{_userInfo.UserName} (ID: {UserId})";
+        var parameters = new DialogParameters<Network.Components.ChangeParentDialog>
+        {
+            { x => x.UserId, UserId },
+            { x => x.UserDisplayName, displayName }
+        };
+        var options = new DialogOptions
+        {
+            MaxWidth = MaxWidth.Small,
+            FullWidth = true,
+            CloseOnEscapeKey = true
+        };
+        var dialog = await DialogService.ShowAsync<Network.Components.ChangeParentDialog>("تغییر والد شبکه", parameters, options);
+        var result = await dialog.Result;
+
+        if (result is { Canceled: false })
+        {
+            await LoadUserInfo();
+            await LoadNetworkHistory();
+        }
+    }
 }

src/BackOffice/Pages/Package/Components/CreateDialog.razor

@@ -1,4 +1,5 @@
 @using CMSMicroservice.Protobuf.Protos.Package
+@using CMSMicroservice.Protobuf.Protos.Configuration
 @using BackOffice.Common.BaseComponents
 @using Microsoft.AspNetCore.Components.Forms
 @using Tizzani.MudBlazor.HtmlEditor
@@ -41,12 +42,77 @@
                     <MudTextField T="string" @bind-Value="Model.Title" Disabled="_isLoading" Label="عنوان" Variant="Variant.Outlined" />
                 </MudItem>
                 <MudItem xs="6">
-                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.Price" Format="N0" Immediate="true"  Disabled="_isLoading" Label="قیمت" Variant="Variant.Outlined" />
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.Price" Format="N0" Immediate="true" Disabled="_isLoading" Label="قیمت (ریال)" Variant="Variant.Outlined" />
                 </MudItem>
             </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="4">
+                    <MudNumericField T="int" HideSpinButtons="true" @bind-Value="Model.SortOrder" Disabled="_isLoading" Label="ترتیب نمایش" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.ActivationFee" Format="N0" Immediate="true" Disabled="_isLoading" Label="هزینه فعال‌سازی (ریال)" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="double" HideSpinButtons="true" @bind-Value="Model.DiscountMultiplier" Disabled="_isLoading" Label="ضریب تخفیف" Variant="Variant.Outlined" />
+                </MudItem>
+            </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="4">
+                    <MudNumericField T="double" HideSpinButtons="true" @bind-Value="Model.MagicWalletMultiplier" Disabled="_isLoading" Label="ضریب کیف پول جادویی" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.MagicWalletMaxDeposit" Format="N0" Immediate="true" Disabled="_isLoading" Label="سقف واریز جادویی" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.MagicWalletMaxCredit" Format="N0" Immediate="true" Disabled="_isLoading" Label="سقف اعتبار جادویی" Variant="Variant.Outlined" />
+                </MudItem>
+            </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="6">
+                    <MudNumericField T="int" HideSpinButtons="true" @bind-Value="Model.MaxBalancesPerLeg" Disabled="_isLoading" Label="حداکثر تعادل هر پا" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="6">
+                    <MudNumericField T="int" HideSpinButtons="true" @bind-Value="Model.MaxNetworkLevel" Disabled="_isLoading" Label="حداکثر سطح شبکه" Variant="Variant.Outlined" />
+                </MudItem>
+            </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.IsActive" Disabled="_isLoading" Label="فعال" Color="Color.Success" />
+                </MudItem>
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.IsBasePackage" Disabled="_isLoading" Label="پکیج پایه" Color="Color.Primary" />
+                </MudItem>
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.SupportsDirectPurchase" Disabled="_isLoading" Label="پرداخت مستقیم" Color="Color.Info" />
+                </MudItem>
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.SupportsDayaPurchase" Disabled="_isLoading" Label="اعتبار دایا" Color="Color.Warning" />
+                </MudItem>
+            </MudStack>
+
+            @if (_features.Any())
+            {
+                <MudText Typo="Typo.subtitle1" Class="mt-4 mb-2"><strong>ویژگی‌های پکیج</strong></MudText>
+                <MudStack Row="true" Wrap="Wrap.Wrap">
+                    @foreach (var feature in _features)
+                    {
+                        <MudCheckBox T="bool"
+                                     Value="@(_selectedFeatureIds.Contains(feature.Id))"
+                                     ValueChanged="@((bool v) => ToggleFeature(feature.Id, v))"
+                                     Disabled="_isLoading"
+                                     Label="@feature.Title"
+                                     Color="Color.Primary" />
+                    }
+                </MudStack>
+            }
+
             <MudItem xs="12">
                 <MudHtmlEditor @bind-Html="Model.Description" MinHeight="300px">
-                    <MudHtmlToolbarOptions InsertImage="false" /> <!-- This will exclude the "insert image" toolbar option -->
+                    <MudHtmlToolbarOptions InsertImage="false" />
                 </MudHtmlEditor>
             </MudItem>
 

src/BackOffice/Pages/Package/Components/UpdateDialog.razor

@@ -1,4 +1,5 @@
 @using CMSMicroservice.Protobuf.Protos.Package
+@using CMSMicroservice.Protobuf.Protos.Configuration
 @using BackOffice.Common.BaseComponents
 @using Microsoft.AspNetCore.Components.Forms
 @using Tizzani.MudBlazor.HtmlEditor
@@ -42,12 +43,77 @@
                     <MudTextField T="string" @bind-Value="Model.Title" Disabled="_isLoading" Label="عنوان" Variant="Variant.Outlined" />
                 </MudItem>
                 <MudItem xs="6">
-                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.Price" Disabled="_isLoading" Label="قیمت" Variant="Variant.Outlined" />
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.Price" Disabled="_isLoading" Label="قیمت (ریال)" Variant="Variant.Outlined" />
                 </MudItem>
             </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="4">
+                    <MudNumericField T="int" HideSpinButtons="true" @bind-Value="Model.SortOrder" Disabled="_isLoading" Label="ترتیب نمایش" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.ActivationFee" Format="N0" Immediate="true" Disabled="_isLoading" Label="هزینه فعال‌سازی (ریال)" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="double" HideSpinButtons="true" @bind-Value="Model.DiscountMultiplier" Disabled="_isLoading" Label="ضریب تخفیف" Variant="Variant.Outlined" />
+                </MudItem>
+            </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="4">
+                    <MudNumericField T="double" HideSpinButtons="true" @bind-Value="Model.MagicWalletMultiplier" Disabled="_isLoading" Label="ضریب کیف پول جادویی" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.MagicWalletMaxDeposit" Format="N0" Immediate="true" Disabled="_isLoading" Label="سقف واریز جادویی" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="4">
+                    <MudNumericField T="long" HideSpinButtons="true" @bind-Value="Model.MagicWalletMaxCredit" Format="N0" Immediate="true" Disabled="_isLoading" Label="سقف اعتبار جادویی" Variant="Variant.Outlined" />
+                </MudItem>
+            </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="6">
+                    <MudNumericField T="int" HideSpinButtons="true" @bind-Value="Model.MaxBalancesPerLeg" Disabled="_isLoading" Label="حداکثر تعادل هر پا" Variant="Variant.Outlined" />
+                </MudItem>
+                <MudItem xs="6">
+                    <MudNumericField T="int" HideSpinButtons="true" @bind-Value="Model.MaxNetworkLevel" Disabled="_isLoading" Label="حداکثر سطح شبکه" Variant="Variant.Outlined" />
+                </MudItem>
+            </MudStack>
+
+            <MudStack Row="true" AlignItems="AlignItems.Center">
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.IsActive" Disabled="_isLoading" Label="فعال" Color="Color.Success" />
+                </MudItem>
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.IsBasePackage" Disabled="_isLoading" Label="پکیج پایه" Color="Color.Primary" />
+                </MudItem>
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.SupportsDirectPurchase" Disabled="_isLoading" Label="پرداخت مستقیم" Color="Color.Info" />
+                </MudItem>
+                <MudItem xs="3">
+                    <MudCheckBox T="bool" @bind-Value="Model.SupportsDayaPurchase" Disabled="_isLoading" Label="اعتبار دایا" Color="Color.Warning" />
+                </MudItem>
+            </MudStack>
+
+            @if (_features.Any())
+            {
+                <MudText Typo="Typo.subtitle1" Class="mt-4 mb-2"><strong>ویژگی‌های پکیج</strong></MudText>
+                <MudStack Row="true" Wrap="Wrap.Wrap">
+                    @foreach (var feature in _features)
+                    {
+                        <MudCheckBox T="bool"
+                                     Value="@(_selectedFeatureIds.Contains(feature.Id))"
+                                     ValueChanged="@((bool v) => ToggleFeature(feature.Id, v))"
+                                     Disabled="_isLoading"
+                                     Label="@feature.Title"
+                                     Color="Color.Primary" />
+                    }
+                </MudStack>
+            }
+
             <MudItem xs="12">
                 <MudHtmlEditor @bind-Html="Model.Description" MinHeight="300px">
-                    <MudHtmlToolbarOptions InsertImage="false" /> <!-- This will exclude the "insert image" toolbar option -->
+                    <MudHtmlToolbarOptions InsertImage="false" />
                 </MudHtmlEditor>
             </MudItem>
         </MudStack>

src/BackOffice/Pages/Package/PackageMainPage.razor

@@ -12,13 +12,21 @@
         </MudItem>
     </Filters>
     <Content>
+        @* ── G8: راهنمای مدیریت پکیج (Q28) ── *@
+        <MudAlert Severity="Severity.Warning" Variant="Variant.Text" Dense="true" Class="mb-3" Icon="@Icons.Material.Filled.Warning">
+            تغییر قیمت روی کاربران فعلی اثر ندارد — فقط خریدهای جدید. هر پکیج Pool پورسانت مستقل دارد.
+        </MudAlert>
         <MudDataGrid T="DataModel" ServerData="@(new Func<GridState<DataModel>, Task<GridData<DataModel>>>(ServerReload))"
                      Hover="true" @ref="_gridData" Height="calc(100vh - 240px)">
             <ColGroup>
                 <col />
                 <col />
                 <col />
-                <col style="width: 58px;" />
+                <col />
+                <col />
+                <col />
+                <col />
+                <col style="width: 80px;" />
             </ColGroup>
             <ToolBarContent>
                 <MudText>مدیریت پکیج</MudText>
@@ -51,31 +59,42 @@
 
                     </CellTemplate>
                 </PropertyColumn>
-                <PropertyColumn Property="x => x.Description" Title="توضیحات" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
+                <PropertyColumn Property="x => x.Price" Title="قیمت" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
                     <CellTemplate>
-                        @if (string.IsNullOrWhiteSpace(context.Item.Description))
+                        <MudText Typo="Typo.inherit">@context.Item.Price.ToString("N0")</MudText>
+                    </CellTemplate>
+                </PropertyColumn>
+                <PropertyColumn Property="x => x.SortOrder" Title="ترتیب" />
+                <PropertyColumn Property="x => x.IsActive" Title="وضعیت" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
+                    <CellTemplate>
+                        @if (context.Item.IsActive)
                         {
-                            <MudText Typo="Typo.inherit">-</MudText>
+                            <MudChip T="string" Color="Color.Success" Variant="Variant.Filled" Size="Size.Small">فعال</MudChip>
                         }
                         else
                         {
-
-                            <MudTooltip Text="@(context.Item.Description.HtmlToText())" Arrow="true" Style="@($"{(context.Item.Description.Length < 70 ? string.Empty : "width:600px;")}")">
-                                <MudText Typo="Typo.inherit" Style="text-wrap: nowrap;">
-                                    @(context.Item.Description.HtmlToText().Truncate(20, true))
-                                </MudText>
-                            </MudTooltip>
+                            <MudChip T="string" Color="Color.Default" Variant="Variant.Filled" Size="Size.Small">غیرفعال</MudChip>
                         }
                     </CellTemplate>
                 </PropertyColumn>
-
-                <TemplateColumn StickyLeft="true" Title="عملیات" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
+                <PropertyColumn Property="x => x.IsBasePackage" Title="نوع" CellStyle="text-wrap: nowrap;" HeaderStyle="text-wrap: nowrap;">
                     <CellTemplate>
-                        <MudStack Row="true" AlignItems="AlignItems.Center">
+                        @if (context.Item.IsBasePackage)
+                        {
+                            <MudChip T="string" Color="Color.Primary" Variant="Variant.Filled" Size="Size.Small">پایه</MudChip>
+                        }
+                        else
+                        {
+                            <MudChip T="string" Color="Color.Info" Variant="Variant.Outlined" Size="Size.Small">عادی</MudChip>
+                        }
+                    </CellTemplate>
+                </PropertyColumn>
+                <TemplateColumn Title="">
+                    <CellTemplate>
+                        <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
                             <MudTooltip Text="ویرایش">
-                                <MudIconButton Icon="@Icons.Material.Filled.EditNote" Size="Size.Small" ButtonType="ButtonType.Button" OnClick="@(() => Update(context.Item.Adapt<DataModel>()))" />
+                                <MudIconButton Icon="@Icons.Material.Filled.Edit" Size="Size.Small" ButtonType="ButtonType.Button" OnClick="@(() => Update(context.Item))" />
                             </MudTooltip>
-
                             <MudTooltip Text="آرشیو">
                                 <MudIconButton Icon="@Icons.Material.Filled.DeleteOutline" Size="Size.Small" ButtonType="ButtonType.Button" OnClick="@(() => OnDelete(context.Item))" />
                             </MudTooltip>

src/BackOffice/Pages/Package/PackageMainPage.razor.cs

@@ -33,7 +33,7 @@ public partial class PackageMainPage
     {
         var parameters = new DialogParameters<UpdateDialog> { { x => x.Model, model.Adapt<UpdatePackageRequest>() } };
 
-        var dialog = await DialogService.ShowAsync<UpdateDialog>($"ویرایش پکیج", parameters, new DialogOptions() { CloseButton = true, FullWidth = true, MaxWidth = MaxWidth.Small });
+        var dialog = await DialogService.ShowAsync<UpdateDialog>($"ویرایش پکیج", parameters, new DialogOptions() { CloseButton = true, FullWidth = true, MaxWidth = MaxWidth.Medium });
         var result = await dialog.Result;
 
         if (!result.Canceled)
@@ -70,7 +70,7 @@ public partial class PackageMainPage
 
     public async Task CreateNew()
     {
-        var dialog = await DialogService.ShowAsync<CreateDialog>($"افزودن پکیج", new DialogParameters<CreateDialog>() { { x => x.Model, new CreateNewPackageRequest() } }, new DialogOptions() { CloseButton = true, FullWidth = true, MaxWidth = MaxWidth.Small });
+        var dialog = await DialogService.ShowAsync<CreateDialog>($"افزودن پکیج", new DialogParameters<CreateDialog>() { { x => x.Model, new CreateNewPackageRequest() { IsActive = true, SupportsDirectPurchase = true, DiscountMultiplier = 2.0, MagicWalletMultiplier = 2.5, MaxBalancesPerLeg = 300, MaxNetworkLevel = 15, MagicWalletMaxDeposit = 1_000_000_000, MagicWalletMaxCredit = 2_500_000_000 } } }, new DialogOptions() { CloseButton = true, FullWidth = true, MaxWidth = MaxWidth.Medium });
         var result = await dialog.Result;
         if (!result.Canceled)
         {

src/BackOffice/Pages/Payment/Components/ManualPaymentDialog.razor

@@ -18,7 +18,9 @@
                                  Variant="Variant.Outlined"
                                  Adornment="Adornment.End"
                                  AdornmentText="تومان"
-                                 Disabled="true"
+                                 Required="true"
+                                 RequiredError="مبلغ الزامی است"
+                                 Min="1"
                                  @bind-Value="_createModel.Amount" />
 
                 <MudSelect T="int" 

src/BackOffice/Pages/Payment/Components/ManualPaymentDialog.razor.cs

@@ -30,7 +30,7 @@ public partial class ManualPaymentDialog
     [Parameter] public ManualPaymentModel? Model { get; set; }
 
     private ManualPaymentModel _createModel = new(){
-        Amount = 56000000,
+        Amount = 0,
     };
     private string? _adminNote;
     

src/BackOffice/Pages/Payment/ManualPayments.razor

@@ -6,6 +6,12 @@
 
 <BasePageComponent @ref="_basePage" OnSubmitClick="OnFilterSubmit" OnClearFilterClick="OnFilterCleared">
     <Filters>
+        @* ── G10: هشدار پرداخت دستی (Q28) ── *@
+        <MudItem xs="12">
+            <MudAlert Severity="Severity.Warning" Variant="Variant.Text" Dense="true" Icon="@Icons.Material.Filled.Warning">
+                مبلغ پرداخت باید مطابق قیمت پکیج انتخابی باشد. پکیج‌های مختلف قیمت متفاوتی دارند.
+            </MudAlert>
+        </MudItem>
         <MudItem xs="12" sm="6" md="3">
             <UserAutoComplete Label="جستجوی کاربر" @bind-SelectedUserId="_userIdFilter" />
         </MudItem>

src/BackOffice/Pages/Payment/ManualPayments.razor.cs

@@ -37,7 +37,7 @@ public partial class ManualPayments
             }
 
             var sb = new StringBuilder();
-            sb.AppendLine("شناسه,شناسه کاربر,نام کاربر,مبلغ,نوع,وضعیت,تاریخ ایجاد");
+            sb.AppendLine("شناسه,شناسه کاربر,نام کاربر,پکیج,مبلغ,نوع,وضعیت,تاریخ ایجاد");
 
             foreach (var m in response.Models)
             {
@@ -45,6 +45,7 @@ public partial class ManualPayments
                     m.Id,
                     m.UserId,
                     EscapeCsv(m.UserFullName),
+                    EscapeCsv(m.PackageName ?? "-"),
                     m.Amount.ToString("N0"),
                     EscapeCsv(GetTypeText((int)m.Type)),
                     EscapeCsv(GetStatusText((int)m.Status)),

src/BackOffice/Pages/Wallet/WalletManagementPage.razor

@@ -2,11 +2,11 @@
 @attribute [Authorize(Roles = "Administrator")]
 
 @using CMSMicroservice.Protobuf.Protos.UserWallet
-@using CMSMicroservice.Protobuf.Protos.UserWalletChangeLog
+@using CMSMicroservice.Protobuf.Protos.UserWalletHistory
 @using BackOffice.Pages.AutoComplete
 
 @inject UserWalletContract.UserWalletContractClient WalletClient
-@inject UserWalletChangeLogContract.UserWalletChangeLogContractClient ChangeLogClient
+@inject UserWalletHistoryContract.UserWalletHistoryContractClient ChangeLogClient
 
 <div>
     <MudText Typo="Typo.h5" Class="mb-3">مدیریت کیف‌پول کاربران</MudText>
@@ -85,7 +85,7 @@
                            OnClick="ApplyLogFilter">جستجو</MudButton>
             </MudStack>
 
-            <MudDataGrid T="GetAllUserWalletChangeLogByFilterResponseModel" @ref="_logGrid"
+            <MudDataGrid T="GetAllUserWalletHistoryByFilterResponseModel" @ref="_logGrid"
                          ServerData="LoadChangeLogs"
                          Hover="true" Dense="true"
                          Height="calc(100vh - 340px)">
@@ -135,7 +135,7 @@
                     <MudAlert Severity="Severity.Info" Dense="true" Variant="Variant.Text" Class="my-4">موردی یافت نشد.</MudAlert>
                 </NoRecordsContent>
                 <PagerContent>
-                    <MudDataGridPager T="GetAllUserWalletChangeLogByFilterResponseModel" PageSizeOptions="@(new int[] { 20, 50, 100 })"
+                    <MudDataGridPager T="GetAllUserWalletHistoryByFilterResponseModel" PageSizeOptions="@(new int[] { 20, 50, 100 })"
                                       InfoFormat="سطر {first_item} تا {last_item} از {all_items}"
                                       RowsPerPageString="تعداد در صفحه" />
                 </PagerContent>
@@ -147,7 +147,7 @@
 @code {
     private int _activeTab;
     private MudDataGrid<GetAllUserWalletByFilterResponseModel>? _walletGrid;
-    private MudDataGrid<GetAllUserWalletChangeLogByFilterResponseModel>? _logGrid;
+    private MudDataGrid<GetAllUserWalletHistoryByFilterResponseModel>? _logGrid;
 
     // Wallet filters
     private long? _filterUserId;
@@ -183,14 +183,14 @@
         }
     }
 
-    private async Task<GridData<GetAllUserWalletChangeLogByFilterResponseModel>> LoadChangeLogs(GridState<GetAllUserWalletChangeLogByFilterResponseModel> state)
+    private async Task<GridData<GetAllUserWalletHistoryByFilterResponseModel>> LoadChangeLogs(GridState<GetAllUserWalletHistoryByFilterResponseModel> state)
     {
         try
         {
-            var request = new GetAllUserWalletChangeLogByFilterRequest
+            var request = new GetAllUserWalletHistoryByFilterRequest
             {
                 PaginationState = new() { PageNumber = state.Page + 1, PageSize = state.PageSize },
-                Filter = new GetAllUserWalletChangeLogByFilterFilter()
+                Filter = new GetAllUserWalletHistoryByFilterFilter()
             };
 
             if (_logFilterUserId.HasValue && _logFilterUserId.Value > 0)
@@ -199,8 +199,8 @@
             if (_logFilterIsIncrease.HasValue)
                 request.Filter.IsIncrease = _logFilterIsIncrease.Value;
 
-            var result = await ChangeLogClient.GetAllUserWalletChangeLogByFilterAsync(request);
-            return new GridData<GetAllUserWalletChangeLogByFilterResponseModel>
+            var result = await ChangeLogClient.GetAllUserWalletHistoryByFilterAsync(request);
+            return new GridData<GetAllUserWalletHistoryByFilterResponseModel>
             {
                 Items = result?.Models?.ToList() ?? new(),
                 TotalItems = (int)(result?.MetaData?.TotalCount ?? 0)
@@ -209,7 +209,7 @@
         catch (Exception ex)
         {
             Snackbar.Add($"خطا: {ex.Message}", Severity.Error);
-            return new GridData<GetAllUserWalletChangeLogByFilterResponseModel>();
+            return new GridData<GetAllUserWalletHistoryByFilterResponseModel>();
         }
     }