Bug fix

CardCollector/Commands/CallbackQuery/BuyShopItem.cs

@@ -12,7 +12,6 @@ namespace CardCollector.Commands.CallbackQuery
     public class BuyShopItem : CallbackQueryCommand
     {
         protected override string CommandText => Command.buy_shop_item;
-        protected override bool ClearStickers => true;
 
         public override async Task Execute()
         {
@@ -28,15 +27,14 @@ namespace CardCollector.Commands.CallbackQuery
                 ? await SpecialOfferUsersDao.NowUsed(User.Id, module.SelectedPosition.Id)
                 : false;
             var currency = CallbackData.Split('=')[1];
-            
             if (currency == "coins" && User.Cash.Coins < resultPriceCoins)
-                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.not_enougth_coins);
+                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.not_enougth_coins, true);
             else if (currency == "gems" && User.Cash.Gems < resultPriceGems)
-                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.not_enougth_gems);
+                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.not_enougth_gems, true);
             else if (offerExpired)
-                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.offer_expired);
+                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.offer_expired, true);
             else if (offerSpecial && !offerInfinite && offerUsed)
-                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.you_already_use_this_offer);
+                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.you_already_use_this_offer, true);
             else
             {
                 if (currency == "coins") User.Cash.Coins -= resultPriceCoins;

CardCollector/Commands/CallbackQuery/BuySticker.cs

@@ -18,11 +18,11 @@ namespace CardCollector.Commands.CallbackQuery
             var auctionModule = User.Session.GetModule<AuctionModule>();
             if (auctionModule.Count > auctionModule.MaxCount)
             {
-                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.not_enougth_stickers);
+                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.not_enougth_stickers, true);
                 await new Back(User, Update).PrepareAndExecute();
             }
             else if (auctionModule.Price * auctionModule.Count > User.Cash.Gems)
-                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.not_enougth_gems);
+                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.not_enougth_gems, true);
             else
             {
                 await auctionModule.SelectedPosition.BuyCard(auctionModule.Count);

CardCollector/Commands/CallbackQuery/CombineStickers.cs

@@ -19,7 +19,7 @@ namespace CardCollector.Commands.CallbackQuery
             var combineModule = User.Session.GetModule<CombineModule>();
             var price = combineModule.CalculateCombinePrice();
             if (User.Cash.Coins < price)
-                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.not_enougth_coins);
+                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.not_enougth_coins, true);
             else
             {
                 User.Cash.Coins -= price;

CardCollector/Commands/CallbackQuery/ConfirmBuying.cs

@@ -16,7 +16,7 @@ namespace CardCollector.Commands.CallbackQuery
             var auctionModule = User.Session.GetModule<AuctionModule>();
             var price = auctionModule.Price * auctionModule.Count ;
             if (price > User.Cash.Gems)
-                await MessageController.AnswerCallbackQuery(User, Update.CallbackQuery!.Id, Messages.not_enougth_gems);
+                await MessageController.AnswerCallbackQuery(User, Update.CallbackQuery!.Id, Messages.not_enougth_gems, true);
             else
             {
                 var text = $"{Messages.confirm_buying}" +

CardCollector/Commands/CallbackQuery/ConfirmExchange.cs

@@ -15,7 +15,7 @@ namespace CardCollector.Commands.CallbackQuery
         {
             var module = User.Session.GetModule<ShopModule>();
             if (module.EnteredExchangeSum > User.Cash.Gems)
-                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.not_enougth_gems);
+                await MessageController.AnswerCallbackQuery(User, CallbackQueryId, Messages.not_enougth_gems, true);
             else
             {
                 User.Cash.Gems -= module.EnteredExchangeSum;

CardCollector/Commands/CallbackQuery/SpecialOffers.cs

@@ -12,6 +12,7 @@ namespace CardCollector.Commands.CallbackQuery
     {
         protected override string CommandText => Command.special_offers;
         protected override bool AddToStack => true;
+        protected override bool ClearStickers => true;
 
         public override async Task Execute()
         {

CardCollector/Controllers/MessageController.cs

@@ -151,9 +151,9 @@ namespace CardCollector.Controllers
         {
             try
             {
-                user.Session.UndoCurrentCommand();
                 if (!user.IsBlocked)
                     await Bot.Client.AnswerCallbackQueryAsync(callbackQueryId, text, showAlert);
+                user.Session.UndoCurrentCommand();
             }
             catch (Exception e)
             {