move to production

.github/workflows/deploy-frontend-azurepreview.yml

@@ -64,13 +64,11 @@ jobs:
           echo "=============== list modified files ==============="
           git fetch origin ${{ github.base_ref }}
           git diff --name-only \
-            origin/${{ github.base_ref }} \
-            ${{ github.event.pull_request.head.sha }}
+            origin/${{ github.base_ref }}...${{ github.event.pull_request.head.sha }}
 
           echo "========== check paths of modified files =========="
           git diff --name-only \
-            origin/${{ github.base_ref }} \
-            ${{ github.event.pull_request.head.sha }} > files.txt
+            origin/${{ github.base_ref }}...${{ github.event.pull_request.head.sha }} > files.txt
 
           echo "run_calibrate_app=false" >>$GITHUB_OUTPUT
           echo "run_analytics_platform=false" >>$GITHUB_OUTPUT

.github/workflows/safe-checks.yml

@@ -31,8 +31,7 @@ jobs:
         run: |
           git fetch origin ${{ github.base_ref }}
           git diff --name-only \
-            origin/${{ github.base_ref }} \
-            ${{ github.event.pull_request.head.sha }} > files.txt
+            origin/${{ github.base_ref }}...${{ github.event.pull_request.head.sha }} > files.txt
           cat files.txt
 
           echo "website=false"   >> $GITHUB_OUTPUT

k8s/platform/k8s-aks/airqo-platform/values-stage.yaml

@@ -1,7 +1,7 @@
 replicaCount: 1
 image:
   repository: airqoacr.azurecr.io/airqo-stage-next-platform
-  tag: stage-ddb8fce8-1781099684
+  tag: stage-8da25131-1781120225
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 nameOverride: ''

k8s/vertex/k8s-aks/airqo-vertex/values-stage.yaml

@@ -1,7 +1,7 @@
 replicaCount: 2
 image:
   repository: airqoacr.azurecr.io/airqo-stage-vertex
-  tag: stage-ddb8fce8-1781099684
+  tag: stage-f014b3b6-1781155767
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 nameOverride: ''

src/mobile/lib/src/app/dashboard/pages/location_selection/components/location_list_view.dart

@@ -300,88 +300,120 @@ class LocationListView extends StatelessWidget with UiLoggy {
         loggy.debug(
             'Split measurements: ${selectedMeasurements.length} selected, ${unselectedMeasurements.length} unselected');
 
-        return ListView(
-          children: [
-            if (selectedMeasurements.isNotEmpty) ...[
-              Container(
-                margin: const EdgeInsets.only(top: 12, bottom: 4),
-                padding:
-                    const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-                decoration: BoxDecoration(
-                  color: Theme.of(context).brightness == Brightness.dark
-                      ? AppColors.darkHighlight.withValues(alpha: 0.5)
-                      : AppColors.lightHighlight.withValues(alpha: 0.5),
-                ),
-                child: Row(
-                  children: [
-                    Icon(
-                      Icons.favorite,
-                      size: 18,
-                      color: AppColors.primaryColor,
-                    ),
-                    const SizedBox(width: 8),
-                    TranslatedText(
-                      "Favorite Locations",
-                      style: TextStyle(
-                        fontSize: 15,
-                        fontWeight: FontWeight.bold,
-                        color: Theme.of(context).textTheme.headlineSmall?.color,
-                      ),
-                    ),
-                    const Spacer(),
-                    Text(
-                      "${selectedMeasurements.length}",
-                      style: TextStyle(
-                        fontSize: 14,
-                        fontWeight: FontWeight.bold,
-                        color: AppColors.primaryColor,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              ...selectedMeasurements
-                  .map((m) => _buildLocationTile(m, context: context)),
-              const Divider(thickness: 1, height: 16),
-            ],
-            Container(
-              margin: const EdgeInsets.only(top: 8, bottom: 4),
-              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-              decoration: BoxDecoration(
-                color: Theme.of(context).brightness == Brightness.dark
-                    ? AppColors.darkHighlight.withValues(alpha: 0.5)
-                    : AppColors.lightHighlight.withValues(alpha: 0.5),
-              ),
-              child: Row(
-                children: [
-                  Icon(
-                    Icons.location_on,
-                    size: 18,
-                    color: Theme.of(context).textTheme.headlineSmall?.color,
-                  ),
-                  const SizedBox(width: 8),
-                  TranslatedText(
-                    unselectedMeasurements.isEmpty &&
-                            selectedMeasurements.isNotEmpty
-                        ? "Other Locations"
-                        : "All Locations",
-                    style: TextStyle(
-                      fontSize: 15,
-                      fontWeight: FontWeight.bold,
-                      color: Theme.of(context).textTheme.headlineSmall?.color,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            ...unselectedMeasurements
-                .map((m) => _buildLocationTile(m, context: context)),
-          ],
+        return ListView.builder(
+          itemCount: _mainListItemCount(selectedMeasurements, unselectedMeasurements),
+          itemBuilder: (context, index) => _buildMainListItem(
+            context,
+            index,
+            selectedMeasurements,
+            unselectedMeasurements,
+          ),
         );
       },
     );
   }
 
+  int _mainListItemCount(List<Measurement> selected, List<Measurement> unselected) {
+    // With favorites: [favHeader, ...selected, divider, allHeader, ...unselected]
+    // Without:        [allHeader, ...unselected]
+    return selected.isNotEmpty
+        ? 1 + selected.length + 1 + 1 + unselected.length
+        : 1 + unselected.length;
+  }
+
+  Widget _buildMainListItem(
+    BuildContext context,
+    int index,
+    List<Measurement> selected,
+    List<Measurement> unselected,
+  ) {
+    if (selected.isNotEmpty) {
+      if (index == 0) return _buildFavoritesHeader(context, selected.length);
+      if (index <= selected.length) {
+        return _buildLocationTile(selected[index - 1], context: context);
+      }
+      if (index == selected.length + 1) return const Divider(thickness: 1, height: 16);
+      if (index == selected.length + 2) {
+        return _buildSectionHeader(context, selected, unselected);
+      }
+      return _buildLocationTile(unselected[index - selected.length - 3], context: context);
+    }
+    if (index == 0) return _buildSectionHeader(context, selected, unselected);
+    return _buildLocationTile(unselected[index - 1], context: context);
+  }
+
+  Widget _buildFavoritesHeader(BuildContext context, int count) {
+    return Container(
+      margin: const EdgeInsets.only(top: 12, bottom: 4),
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      decoration: BoxDecoration(
+        color: Theme.of(context).brightness == Brightness.dark
+            ? AppColors.darkHighlight.withValues(alpha: 0.5)
+            : AppColors.lightHighlight.withValues(alpha: 0.5),
+      ),
+      child: Row(
+        children: [
+          Icon(Icons.favorite, size: 18, color: AppColors.primaryColor),
+          const SizedBox(width: 8),
+          TranslatedText(
+            "Favorite Locations",
+            style: TextStyle(
+              fontSize: 15,
+              fontWeight: FontWeight.bold,
+              color: Theme.of(context).textTheme.headlineSmall?.color,
+            ),
+          ),
+          const Spacer(),
+          Text(
+            "$count",
+            style: TextStyle(
+              fontSize: 14,
+              fontWeight: FontWeight.bold,
+              color: AppColors.primaryColor,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSectionHeader(
+    BuildContext context,
+    List<Measurement> selected,
+    List<Measurement> unselected,
+  ) {
+    final label = selected.isNotEmpty
+        ? "Other Locations"
+        : "All Locations";
+    return Container(
+      margin: const EdgeInsets.only(top: 8, bottom: 4),
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      decoration: BoxDecoration(
+        color: Theme.of(context).brightness == Brightness.dark
+            ? AppColors.darkHighlight.withValues(alpha: 0.5)
+            : AppColors.lightHighlight.withValues(alpha: 0.5),
+      ),
+      child: Row(
+        children: [
+          Icon(
+            Icons.location_on,
+            size: 18,
+            color: Theme.of(context).textTheme.headlineSmall?.color,
+          ),
+          const SizedBox(width: 8),
+          TranslatedText(
+            label,
+            style: TextStyle(
+              fontSize: 15,
+              fontWeight: FontWeight.bold,
+              color: Theme.of(context).textTheme.headlineSmall?.color,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
   Widget _buildLocationTitle(
       Measurement measurement, BuildContext context, bool isSelected) {
     final details = measurement.siteDetails;

src/mobile/lib/src/app/learn/pages/kya_page.dart

@@ -166,27 +166,23 @@ class _KyaPageState extends State<KyaPage> with UiLoggy {
     return BlocBuilder<KyaBloc, KyaState>(
       builder: (context, state) {
         if (state is LessonsLoading || _isRetrying) {
-          return Column(children: [
+          return ListView(children: [
             ShimmerContainer(height: 200, borderRadius: 8, width: double.infinity),
             const SizedBox(height: 16),
             ShimmerContainer(height: 200, borderRadius: 8, width: double.infinity),
           ]);
         } else if (state is LessonsLoaded) {
-          return SingleChildScrollView(
-            child: Column(
-              children: state.model.kyaLessons
-                  .map((lesson) => KyaLessonContainer(lesson))
-                  .toList(),
-            ),
+          return ListView.builder(
+            itemCount: state.model.kyaLessons.length,
+            itemBuilder: (context, index) =>
+                KyaLessonContainer(state.model.kyaLessons[index]),
           );
         } else if (state is LessonsLoadingError) {
           if (state.cachedModel != null) {
-            return SingleChildScrollView(
-              child: Column(
-                children: state.cachedModel!.kyaLessons
-                    .map((lesson) => KyaLessonContainer(lesson))
-                    .toList(),
-              ),
+            return ListView.builder(
+              itemCount: state.cachedModel!.kyaLessons.length,
+              itemBuilder: (context, index) =>
+                  KyaLessonContainer(state.cachedModel!.kyaLessons[index]),
             );
           }
           return RefreshIndicator(

src/mobile/lib/src/app/learn/widgets/kya_lesson_container.dart

@@ -1,5 +1,6 @@
 import 'package:airqo/src/app/learn/models/lesson_response_model.dart';
 import 'package:airqo/src/app/learn/pages/lesson_page.dart';
+import 'package:airqo/src/app/shared/widgets/loading_widget.dart';
 import 'package:airqo/src/app/shared/widgets/translated_text.dart';
 import 'package:flutter/material.dart';
 
@@ -30,6 +31,18 @@ class KyaLessonContainer extends StatelessWidget {
                   child: Image.network(
                     kyaLesson.image,
                     fit: BoxFit.cover,
+                    loadingBuilder: (context, child, loadingProgress) {
+                      if (loadingProgress == null) return child;
+                      return ShimmerContainer(
+                        height: double.infinity,
+                        width: double.infinity,
+                        borderRadius: 8,
+                      );
+                    },
+                    errorBuilder: (context, error, stackTrace) => Container(
+                      color: Theme.of(context).highlightColor,
+                      child: const Center(child: Icon(Icons.broken_image, size: 48)),
+                    ),
                   ),
                 ),
               ),

src/mobile/lib/src/app/profile/pages/profile_page.dart

@@ -276,6 +276,10 @@ class _ProfilePageState extends State<ProfilePage> with UiLoggy {
           fit: BoxFit.cover,
           width: 100,
           height: 100,
+          loadingBuilder: (context, child, loadingProgress) {
+            if (loadingProgress == null) return child;
+            return initialsWidget;
+          },
           errorBuilder: (context, error, stackTrace) {
             loggy.warning('Error loading profile image: $error');
             return initialsWidget;

src/platform/.env.example

@@ -34,10 +34,6 @@ CLOUDINARY_API_SECRET=
 NEXT_PUBLIC_SLACK_WEBHOOK_URL=
 NEXT_PUBLIC_ENABLE_SLACK_DEV_NOTIFS=false
 
-# Recaptcha
-NEXT_PUBLIC_RECAPTCHA_SITE_KEY=
-RECAPTCHA_SECRET_KEY=
-
 # Payments
 NEXT_PUBLIC_PAYMENTS_STANDARD_PRICE_ID=
 PAYMENTS_STANDARD_PRICE_ID=

src/platform/src/app/(dashboard)/system/clients/[clientId]/page.tsx

@@ -8,7 +8,8 @@ import { LoadingState } from '@/shared/components/ui/loading-state';
 import { toast } from '@/shared/components/ui';
 import { WarningBanner } from '@/shared/components/ui/banner';
 import { formatDate, parseDate } from '@/shared/utils';
-import { getUserFriendlyErrorMessage } from '@/shared/utils/errorMessages';
+import { getUserFriendlyErrorMessage, isForbiddenError } from '@/shared/utils/errorMessages';
+import { AccessDenied } from '@/shared/components/AccessDenied';
 import { sanitizeErrorForLogging } from '@/shared/utils/sanitizeErrorForLogging';
 import {
   AqArrowLeft,
@@ -26,13 +27,12 @@ import EditClientDialog from '@/modules/api-client/components/EditClientDialog';
 import InactiveClientDialog from '@/modules/api-client/components/InactiveClientDialog';
 import TokenSecurityDialog from '@/modules/api-client/components/TokenSecurityDialog';
 import { PermissionGuard } from '@/shared/components/PermissionGuard';
-import { useRBAC, useUser } from '@/shared/hooks';
+import { useRBAC } from '@/shared/hooks';
 
 const ClientDetailsPage: React.FC = () => {
   const params = useParams();
   const router = useRouter();
   const { hasAnyPermission } = useRBAC();
-  const { user } = useUser();
   const clientId = params?.clientId as string;
 
   const [editDialogOpen, setEditDialogOpen] = useState(false);
@@ -247,6 +247,20 @@ const ClientDetailsPage: React.FC = () => {
   }
 
   if (error || !client) {
+    if (isForbiddenError(error)) {
+      return (
+        <PermissionGuard
+          requiredPermissions={['SYSTEM_ADMIN']}
+          accessDeniedTitle="Access Restricted"
+          accessDeniedMessage="You need system administrator permissions to access API client details."
+        >
+          <AccessDenied
+            title="Access Denied"
+            message="You do not have the required permissions to view this client."
+          />
+        </PermissionGuard>
+      );
+    }
     return (
       <div className="space-y-6">
         <Button
@@ -268,10 +282,9 @@ const ClientDetailsPage: React.FC = () => {
 
   return (
     <PermissionGuard
-      requiredRoles={['AIRQO_SUPER_ADMIN']}
-      customCheck={() => !!user?.email?.toLowerCase().endsWith('@airqo.net')}
+      requiredPermissions={['SYSTEM_ADMIN']}
       accessDeniedTitle="Access Restricted"
-      accessDeniedMessage="You need super admin privileges and a valid AirQo email to access API client details."
+      accessDeniedMessage="You need system administrator permissions to access API client details."
     >
       <div className="space-y-6">
         {/* Back Button */}