From dab85aee96e4557f55aed7cc11252496f246218e Mon Sep 17 00:00:00 2001
From: Paulo Massingue <paulo.massingue@tempo.co.mz>
Date: Thu, 5 Nov 2026 12:21:25 +0200
Subject: [PATCH] correcao de conflitos

---
 resources/js/pages/portal/fiscal-forms.tsx | 2 +-
 tests/frontend/fiscal-form-entry.test.mjs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/pages/portal/fiscal-forms.tsx b/resources/js/pages/portal/fiscal-forms.tsx
index 745226cc..47d87cea 100644
--- a/resources/js/pages/portal/fiscal-forms.tsx
+++ b/resources/js/pages/portal/fiscal-forms.tsx
@@ -1,6 +1,6 @@
 import { Head, Link, router } from '@inertiajs/react';
 import { useEffect, useState } from 'react';
-import { PortalMenu } from '@/layouts/portal-navigation';
+import { PortalMenu } from '@/components/portal-menu';
 import { fiscalForms, fiscalFormFields, fiscalPreparationIssues, newFiscalPreparation, readFiscalPreparation, type FiscalFormKind, type FiscalPreparation } from '@/lib/fiscal-form-preparation';
 
 const input =
diff --git a/tests/frontend/fiscal-form-entry.test.mjs b/tests/frontend/fiscal-form-entry.test.mjs
index 8b074077..42b4fe3d 100644
--- a/tests/frontend/fiscal-form-entry.test.mjs
+++ b/tests/frontend/fiscal-form-entry.test.mjs
@@ -11,7 +11,7 @@ const require=createRequire(import.meta.url);
 const source=fs.readFileSync(new URL('../../resources/js/pages/portal/fiscal-forms.tsx',import.meta.url),'utf8');
 const compiled=ts.transpileModule(source,{compilerOptions:{module:ts.ModuleKind.CommonJS,target:ts.ScriptTarget.ES2022,jsx:ts.JsxEmit.ReactJSX}}).outputText;
 const module={exports:{}};
-new Function('require','module','exports',compiled)(name=>name==='@inertiajs/react'?{Head:()=>null,Link:({href,children,...props})=>React.createElement('a',{href,...props},children),router:{on:()=>()=>{}}}:name==='@/layouts/portal-navigation'?{PortalMenu:()=>null}:name==='@/lib/fiscal-form-preparation'?forms:require(name),module,module.exports);
+new Function('require','module','exports',compiled)(name=>name==='@inertiajs/react'?{Head:()=>null,Link:({href,children,...props})=>React.createElement('a',{href,...props},children),router:{on:()=>()=>{}}}:name==='@/components/portal-menu'?{PortalMenu:()=>null}:name==='@/lib/fiscal-form-preparation'?forms:require(name),module,module.exports);
 test('fiscal entry renders labelled editable fields and a guided preparation rather than legislation',()=>{
     const html=renderToStaticMarkup(React.createElement(module.exports.default));
     for(const label of ['Identificação e período','Nome ou designação social','NUIT','Período — ano e mês','Conferir e guardar','Guardar ficheiro para continuar','Recuperar ficheiro guardado','Confirmar recuperação']) {