all

src/bots/handlers/serviceHandlers.ts

@@ -453,7 +453,7 @@ export const handleServicesPagination = async (ctx: BotContext, page: number, so
         logger.error(`Error editing auth required message: ${editError.message}`);
       }
     }
-    return; // Explicitly return nothing after editing
+    return;
   }
 
   try {
@@ -463,14 +463,14 @@ export const handleServicesPagination = async (ctx: BotContext, page: number, so
         getServicesPaginationInfo(page),
         {
           parse_mode: 'HTML',
-          reply_markup: getServicesKeyboard(page, sortBy).reply_markup // Pass sortBy here
+          reply_markup: getServicesKeyboard(page, sortBy).reply_markup
         }
       );
     } catch (editError: any) {
       if (editError.message && editError.message.includes('message is not modified')) {
         logger.info(`Services page message not modified for page ${page}. No action needed.`);
       } else {
-        throw editError; // Re-throw other errors to be caught by the outer catch
+        throw editError;
       }
     }
   } catch (error: any) {
@@ -580,181 +580,4 @@ export const handleServiceSelection = async (ctx: BotContext, service: string, s
     buttons.push([Markup.button.callback('Price ⬇️ (Cheapest)', `sort_countries_price_asc_${service}_${page}`)]);
 
     // Add search country button
-    buttons.push([Markup.button.callback('🔍 Search Country', `search_country_${service}_${sortBy || 'default'}_${page}`)]);
-
-    // Generate country buttons in pairs
-    for (let i = 0; i < pageCountries.length; i += rowSize) {
-      const row = [];
-      for (let j = 0; j < rowSize && i + j < pageCountries.length; j++) {
-        const { countryId, minPrice, maxPrice } = pageCountries[i + j];
-        const countryInfo = countryData[countryId.toLowerCase()];
-        if (countryInfo) {
-          const priceText = minPrice === maxPrice 
-            ? `${minPrice}$`
-            : `${minPrice}$-${maxPrice}$`;
-            
-          row.push(
-            Markup.button.callback(
-              `${countryInfo.flag} ${countryInfo.label} (${priceText})`,
-              `country_${service}_${countryId}`
-            )
-          );
-        }
-      }
-      if (row.length > 0) {
-        buttons.push(row);
-      }
-    }
-
-    // Add pagination buttons
-    const paginationRow = [];
-    if (page > 0) {
-      paginationRow.push(
-        Markup.button.callback(
-          '⬅️ Previous',
-          `country_page_${service}_${page - 1}`
-        )
-      );
-    }
-    
-    paginationRow.push(
-      Markup.button.callback(
-        `📄 ${page + 1}/${totalPages}`,
-        'noop'
-      )
-    );
-    
-    if (page < totalPages - 1) {
-      paginationRow.push(
-        Markup.button.callback(
-          'Next ➡️',
-          `country_page_${service}_${page + 1}`
-        )
-      );
-    }
-    
-    if (paginationRow.length > 0) {
-      buttons.push(paginationRow);
-    }
-
-    // Add back button
-    buttons.push([
-      Markup.button.callback('🔙 Back to Services', 'browse_services')
-    ]);
-
-    // Edit the existing message instead of sending a new one
-    try {
-      await ctx.editMessageText(
-        getCountriesListMessage(service),
-        {
-          parse_mode: 'HTML',
-          reply_markup: Markup.inlineKeyboard(buttons).reply_markup
-        }
-      );
-      return; // Explicitly return after successful edit
-    } catch (editError: any) {
-      if (editError.message && editError.message.includes('message is not modified')) {
-        logger.info(`Message not modified for service ${service} on page ${page}. No action needed.`);
-      } else {
-        logger.error(`Error editing message for service ${service} on page ${page}: ${editError.message}`);
-      }
-      return; // Explicitly return after handling edit error
-    }
-  } catch (error: any) {
-    logger.error(`Error fetching countries for ${service}: ${error.message}`);
-    try {
-      await ctx.editMessageText(
-        getServiceErrorMessage(service),
-        {
-          parse_mode: 'HTML',
-          reply_markup: Markup.inlineKeyboard([
-            [Markup.button.callback('🔙 Back to Services', 'browse_services')],
-          ]).reply_markup
-        }
-      );
-      return; // Explicitly return after displaying service error message
-    } catch (editError: any) {
-      if (editError.message && editError.message.includes('message is not modified')) {
-        logger.info(`Error message already displayed for service ${service}. No action needed.`);
-      } else {
-        logger.error(`Error editing message in error handler for service ${service}: ${editError.message}`);
-      }
-      return; // Explicitly return after handling error message edit error
-    }
-  }
-};
-
-export const handleCountrySelection = async (ctx: BotContext) => {
-  const match = ctx.match as RegExpMatchArray;
-  const service = match[1];
-  const countryId = match[2];
-  
-  // Authentication check
-  const telegramId = ctx.from?.id;
-  if (!telegramId || !authService.isUserLoggedIn(telegramId, ctx)) {
-    await ctx.editMessageText(getAuthRequiredMessage(), { reply_markup: getMainMenuKeyboard().reply_markup });
-    return;
-  }
-  
-  try {
-    const prices = await virtualNumberService.getPrices(service, countryId);
-
-    if (!prices || !prices[countryId] || !prices[countryId][service] || 
-        Object.keys(prices[countryId][service]).length === 0) {
-      await ctx.editMessageText(
-        getNoPricesMessage(service, countryId),
-        {
-          parse_mode: 'HTML',
-          reply_markup: getLoggedInMenuKeyboard().reply_markup
-        }
-      );
-      return;
-    }
-    
-    // Apply profit to prices before displaying
-    const pricesWithProfit = Object.entries(prices[countryId][service]).reduce((acc: any, [operator, operatorData]) => {
-      // operatorData contains cost and count properties
-      if (operatorData && typeof operatorData === 'object' && 'cost' in operatorData) {
-        acc[operator] = {
-          ...operatorData,
-          cost: calculatePriceWithProfit(ctx, Number(operatorData.cost), 'RUB')
-        };
-      }
-      return acc;
-    }, {});
-  
-    try {
-      await ctx.editMessageText(
-        getPricesListMessage(service, countryId, pricesWithProfit, ctx),
-        {
-          parse_mode: 'HTML',
-          reply_markup: getServicePricesKeyboard(pricesWithProfit, service, countryId, ctx).reply_markup
-        }
-      );
-    } catch (editError: any) {
-      if (editError.message && editError.message.includes('message is not modified')) {
-        logger.info(`Prices list message not modified for service ${service} in country ${countryId}. No action needed.`);
-      } else {
-        logger.error(`Error editing prices list message for service ${service} in country ${countryId}: ${editError.message}`);
-      }
-    }
-    
-  } catch (error: any) {
-    logger.error(`Error fetching prices for ${service} in ${countryId}: ${error.message}`);
-    try {
-      await ctx.editMessageText(
-        getPricesErrorMessage(service, countryId),
-        {
-          parse_mode: 'HTML',
-          reply_markup: getLoggedInMenuKeyboard().reply_markup
-        }
-      );
-    } catch (editError: any) {
-      if (editError.message && editError.message.includes('message is not modified')) {
-        logger.info(`Error message already displayed for service ${service} in country ${countryId}. No action needed.`);
-      } else {
-        logger.error(`Error editing message in country selection error handler for service ${service} in country ${countryId}: ${editError.message}`);
-      }
-    }
-  }
-};
+    buttons.push([Markup.button.callback('🔍 Search Country', `search_country_${service}_${sortBy || 'default'}_${page}`

src/bots/utils/keyboardUtils.ts

@@ -41,19 +41,21 @@ export const getServicesKeyboard = (page: number = 0, sortBy?: 'az' | 'za') => {
   const services = Object.entries(fiveSimProducts);
   const rowSize = 2; // 2 buttons per row
   const servicesPerPage = 10;
-  const totalPages = Math.ceil(services.length / servicesPerPage);
   
-  // Get services for current page
-  const startIndex = page * servicesPerPage;
-  const endIndex = Math.min(startIndex + servicesPerPage, services.length);
-  let pageServices = services.slice(startIndex, endIndex);
-
-  // Apply sorting for services
+  // Sort all services first
+  let sortedServices = [...services];
   if (sortBy === 'az') {
-    pageServices.sort((a, b) => a[1].label_en.localeCompare(b[1].label_en));
+    sortedServices.sort((a, b) => a[1].label_en.localeCompare(b[1].label_en));
   } else if (sortBy === 'za') {
-    pageServices.sort((a, b) => b[1].label_en.localeCompare(a[1].label_en));
+    sortedServices.sort((a, b) => b[1].label_en.localeCompare(a[1].label_en));
   }
+  
+  const totalPages = Math.ceil(sortedServices.length / servicesPerPage);
+  
+  // Get services for current page
+  const startIndex = page * servicesPerPage;
+  const endIndex = Math.min(startIndex + servicesPerPage, sortedServices.length);
+  const pageServices = sortedServices.slice(startIndex, endIndex);
 
   // Add sort button
   const sortButtonText = sortBy === 'az' ? 'Sort Z-A ⬇️' : 'Sort A-Z ⬆️';