WIP

lib/main.dart

@@ -197,28 +197,30 @@ class _AppState extends State<App> {
 
     final String email = uri.queryParameters['email'] ?? '';
     final String token = uri.queryParameters['token'] ?? '';
-    final BuildContext context = StorageUtil().context!;
+
     final bool isNotEmpty = email.isNotEmpty && token.isNotEmpty;
+    if (isNotEmpty) {
+      final BuildContext context = StorageUtil().context!;
       final MediaQueryData mediaQuery = MediaQuery.of(context);
       final double height = mediaQuery.size.height * 0.8;
       final FlutterFlowTheme theme = FlutterFlowTheme.of(context);
       final Widget screen = ForgotPasswordScreen(email: email, token: token);
-    final Widget Function(BuildContext) builder = (context) => screen;
+      builder(context) => screen;
-    if (isNotEmpty) {
+      WidgetsBinding.instance.addPersistentFrameCallback((_) {
         showModalBottomSheet(
           context: context,
-        builder: (context) => SizedBox(height: height, child: builder(context)),
+          builder: (context) =>
+              SizedBox(height: height, child: builder(context)),
           isScrollControlled: true,
           showDragHandle: true,
           barrierColor: theme.primaryText.withOpacity(0.2),
           backgroundColor: theme.primaryBackground,
-
+          useSafeArea: true,
-
+          enableDrag: true,
+          isDismissible: true,
         ).then((_) => StorageUtil().isRecovered = false);
+      });
     }
-    // Use the extracted email and token as needed
-    // navigatorKey.currentState?.pushNamed('/forgotPassword', arguments: {'email': email, 'token': token});
-
   }
   void _setupFirebaseMessaging() async {
     FirebaseMessaging messaging = FirebaseMessaging.instance;

lib/pages/forgot_password_page/forgot_password_screen.dart

@@ -130,29 +130,17 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> with Ticker
       elevation: 0.0,
     );
   }
-
   SafeArea buildBody(BuildContext context) {
     late final String message = FFLocalizations.of(context).getVariableText(
       ptText: 'Qual será a sua nova senha? Insira abaixo e confirme.',
       enText: 'What will be your new password? Enter it below and confirm.',
     );
     return SafeArea(
-      child: Row(
-        mainAxisSize: MainAxisSize.max,
-        children: [
-          Expanded(
-            flex: 6,
-            child: Container(
-              width: 100.0,
-              height: double.infinity,
-              decoration: BoxDecoration(color: FlutterFlowTheme.of(context).primaryBackground),
-              alignment: const AlignmentDirectional(0.0, -1.0),
-              child: Align(
-                alignment: const AlignmentDirectional(0.0, 0.0),
       child: SingleChildScrollView(
+        child: Padding(
+          padding: const EdgeInsets.only(bottom: 20.0), // Adiciona espaçamento inferior
           child: Column(
             mainAxisSize: MainAxisSize.max,
-                    mainAxisAlignment: MainAxisAlignment.center,
             children: [
               Container(
                 width: 291.0,
@@ -207,6 +195,8 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> with Ticker
                                   focusNode: _model.passwordRegisterFormFocusNode,
                                   visibility: _model.passwordRegisterFormVisibility,
                                   onVisibilityToggle: () => setState(() => _model.passwordRegisterFormVisibility = !_model.passwordRegisterFormVisibility),
+                                  label: FFLocalizations.of(context).getVariableText(ptText: 'Nova Senha', enText: 'New Password'),
+                                  hint: FFLocalizations.of(context).getVariableText(ptText: 'Insira sua senha', enText: 'Enter your password'),
                                 ),
                                 _buildPasswordField(
                                   context,
@@ -214,6 +204,8 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> with Ticker
                                   focusNode: _model.passwordConfirmFormFocusNode,
                                   visibility: _model.passwordConfirmFormVisibility,
                                   onVisibilityToggle: () => setState(() => _model.passwordConfirmFormVisibility = !_model.passwordConfirmFormVisibility),
+                                  label: FFLocalizations.of(context).getVariableText(ptText: 'Confirme a Senha', enText: 'Confirm Password'),
+                                  hint: FFLocalizations.of(context).getVariableText(ptText: 'Confirme sua senha', enText: 'Confirm your password'),
                                 ),
                               ],
                             ),
@@ -259,29 +251,17 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> with Ticker
           ),
         ),
       ),
-            ),
-          ),
-        ],
-      ),
     );
   }
-
+  Widget _buildPasswordField(BuildContext context,
-
+    {
-  Widget _buildPasswordField(
-      BuildContext context, {
       required TextEditingController? controller,
       required FocusNode? focusNode,
       required bool visibility,
-        required VoidCallback onVisibilityToggle}){
+      required VoidCallback onVisibilityToggle,
-      final label = FFLocalizations.of(context).getVariableText(
+      required String hint,
-        ptText: 'Senha',
+      required String label,
-        enText: 'Password',
+    }){
-      );
-      final hint = FFLocalizations.of(context).getVariableText(
-        ptText: 'Insira sua senha',
-        enText: 'Enter your password',
-      );
-
     return Padding(
       padding: const EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 0.0, 16.0),
       child: SizedBox(