From b1f4f1d2a777052fcd78891f665ead3780e556af Mon Sep 17 00:00:00 2001
From: Yasien Mac Mini <yasienmeth@gmail.com>
Date: Mon, 18 Aug 2025 13:11:43 +0200
Subject: [PATCH] update calc nav

---
 .../lib/mih_packages/calculator/mih_calculator.dart   | 10 +++++++++-
 .../calculator/package_tiles/mih_calculator_tile.dart | 11 ++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Frontend/lib/mih_packages/calculator/mih_calculator.dart b/Frontend/lib/mih_packages/calculator/mih_calculator.dart
index 60ecbb87..e119ac4a 100644
--- a/Frontend/lib/mih_packages/calculator/mih_calculator.dart
+++ b/Frontend/lib/mih_packages/calculator/mih_calculator.dart
@@ -1,3 +1,5 @@
+import 'package:go_router/go_router.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart';
@@ -42,7 +44,13 @@ class _MIHCalculatorState extends State<MIHCalculator> {
       icon: const Icon(Icons.arrow_back),
       iconSize: 35,
       onTap: () {
-        Navigator.of(context).pop();
+        context.goNamed(
+          'home',
+          extra: AuthArguments(
+            widget.personalSelected,
+            false,
+          ),
+        );
         FocusScope.of(context).unfocus();
       },
     );
diff --git a/Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart b/Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart
index 0e2ce86a..58c42944 100644
--- a/Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart
+++ b/Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart
@@ -1,3 +1,4 @@
+import 'package:go_router/go_router.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart';
 import 'package:flutter/material.dart';
@@ -23,10 +24,14 @@ class _MihCalculatorTileState extends State<MihCalculatorTile> {
   Widget build(BuildContext context) {
     return MihPackageTile(
       onTap: () {
-        Navigator.of(context).pushNamed(
-          '/calculator',
-          arguments: widget.personalSelected,
+        context.goNamed(
+          "mihCalculator",
+          extra: widget.personalSelected,
         );
+        // Navigator.of(context).pushNamed(
+        //   '/calculator',
+        //   arguments: widget.personalSelected,
+        // );
       },
       appName: "Calculator",
       appIcon: Icon(