diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml
index d6bebdf..3f8906d 100644
--- a/.github/workflows/code-analysis.yml
+++ b/.github/workflows/code-analysis.yml
@@ -23,12 +23,14 @@ jobs:
           restore-keys: ${{ runner.os }}-sonar
       - name: Build
         run: flutter build
-      - name: Execute tests
-        run: flutter test --coverage
       - name: Download sonar-scanner
         run: |
           curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-6.2.1.4610-linux-x64.zip
           unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
+      - name: Execute tests
+        run: |
+              flutter test --coverage
+              ls coverage/
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
diff --git a/README.md b/README.md
index 38c19f4..32cb0dc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 # APP em Flutter para o Projeto Arandu
 
 A new Flutter project.
+## APK
+
+- [APK](https://drive.google.com/file/d/1Onw1dsXU3rjpezBIfxpIiuR0Qq4BxE3D/view?usp=drive_link)
 
 ## Getting Started
 
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 05bdb04..f12839f 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+   <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
+   <uses-permission android:name="android.permission.INTERNET"/>
+
+
     <application
         android:label="aranduapp"
         android:name="${applicationName}"
@@ -31,6 +36,7 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
          https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
diff --git a/android/app/src/main/kotlin/com/example/aranduapp/MainActivity.kt b/android/app/src/main/kotlin/com/example/aranduapp/MainActivity.kt
index 395484c..644cb5f 100644
--- a/android/app/src/main/kotlin/com/example/aranduapp/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/example/aranduapp/MainActivity.kt
@@ -1,5 +1,5 @@
 package com.example.aranduapp
 
-import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity
 
-class MainActivity: FlutterActivity()
+class MainActivity: FlutterFragmentActivity()
diff --git a/assets/images/Component1.png b/assets/images/Component1.png
index 07f4666..822fd0a 100644
Binary files a/assets/images/Component1.png and b/assets/images/Component1.png differ
diff --git a/assets/images/Component2.png b/assets/images/Component2.png
index a12f46b..ecb04ed 100644
Binary files a/assets/images/Component2.png and b/assets/images/Component2.png differ
diff --git a/assets/images/Component3.png b/assets/images/Component3.png
index b6b9434..be4add7 100644
Binary files a/assets/images/Component3.png and b/assets/images/Component3.png differ
diff --git a/lib/core/network/AppInterceptors.dart b/lib/core/network/AppInterceptors.dart
deleted file mode 100644
index 1e91297..0000000
--- a/lib/core/network/AppInterceptors.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-import 'package:aranduapp/core/data/local/StorageValue.dart';
-import 'package:aranduapp/core/log/Log.dart';
-import 'package:dio/dio.dart';
-
-class AppInterceptors extends Interceptor {
-
-  @override
-  Future<void> onRequest(RequestOptions options, RequestInterceptorHandler handler) async {
-      super.onRequest(options, handler);
-
-      try {
-        
-        String? token = await StorageValue.getInstance().getAuthToken();
-
-        if ( token != null) {
-          options.headers['Authorization'] = 'Bearer $token';
-          Log.e(token);
-        }
-
-        handler.next(options);
-
-
-      } catch (e) {
-        Log.e(e);
-      }
-    } 
-}
diff --git a/lib/core/network/BaseApi.dart b/lib/core/network/BaseApi.dart
deleted file mode 100644
index 2add88f..0000000
--- a/lib/core/network/BaseApi.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-
-import 'package:aranduapp/core/log/Log.dart';
-import 'package:aranduapp/core/network/AppInterceptors.dart';
-import 'package:dio/dio.dart';
-
-class BaseApi {
-  final Dio _dio;
-
-  static BaseApi? _instance;
-
-  BaseApi._internal()
-      : _dio = Dio() {
-    _dio.options.baseUrl = 'https://arandu-user-service.onrender.com/';
-    _dio.options.connectTimeout = const Duration(seconds: 5); 
-    _dio.options.receiveTimeout = const Duration(seconds: 5);
-
-    _dio.interceptors.add(AppInterceptors());
-    _dio.interceptors.add(LogInterceptor(requestBody: true, responseBody: true));
-  }
-
-  static BaseApi getInstance() {
-    return _instance ??= BaseApi._internal();
-  }
-
-  Future<Response> get({required String path, Map<String, dynamic>? queryParameters}) async {
-    try {
-      return await _dio.get(path, queryParameters: queryParameters);
-    } catch (e) {
-      Log.e(e);
-      rethrow;  
-    }
-  }
-
-  Future<Response> post({ required String path, Object? data}) async {
-    try {
-      return await _dio.post(path, data: data);
-    } catch (e) {
-      Log.e(e);
-      rethrow; 
-    }
-  }
-}
diff --git a/lib/core/network/app_interceptors.dart b/lib/core/network/app_interceptors.dart
new file mode 100644
index 0000000..d33c847
--- /dev/null
+++ b/lib/core/network/app_interceptors.dart
@@ -0,0 +1,53 @@
+import 'package:aranduapp/core/data/local/StorageValue.dart';
+import 'package:aranduapp/core/log/Log.dart';
+import 'package:aranduapp/core/network/token_manager/auth_service.dart';
+import 'package:aranduapp/core/network/token_manager/model/refresh_token_response.dart';
+import 'package:dio/dio.dart';
+
+class AppInterceptors extends Interceptor {
+  @override
+  Future<void> onRequest(
+      RequestOptions options, RequestInterceptorHandler handler) async {
+    String? token = await StorageValue.getInstance().getAuthToken();
+
+    Log.w(token);
+
+    if (token != null) {
+      options.headers['Authorization'] =  'Bearer $token';
+    } else {
+      Log.w('Token não encontrado');
+    }
+
+    super.onRequest(options, handler);
+  }
+
+  @override
+  Future onError(DioException err, ErrorInterceptorHandler handler) async {
+    if (err.response?.statusCode == 401) {
+      try {
+        Log.i('Token expirado. Tentando atualizar o token...');
+
+        RefreshTokenResponse tokens =
+            await AuthService().refreshToken();
+
+        final requestOptions = err.requestOptions;
+
+        requestOptions.headers['Authorization'] = 'Bearer ${tokens.authToken}';
+
+        final response = await Dio().request(
+          requestOptions.path,
+          options: Options(
+            method: requestOptions.method,
+            headers: requestOptions.headers,
+          ),
+          data: requestOptions.data,
+        );
+
+        Log.i('Token expirado atualizado.');
+        return handler.resolve(response);
+      } catch (e) {
+        super.onError(err, handler);
+      }
+    }
+  }
+}
diff --git a/lib/core/network/base_api.dart b/lib/core/network/base_api.dart
new file mode 100644
index 0000000..3c06739
--- /dev/null
+++ b/lib/core/network/base_api.dart
@@ -0,0 +1,77 @@
+import 'package:aranduapp/core/log/Log.dart';
+import 'package:aranduapp/core/network/app_interceptors.dart';
+
+import 'package:dio/dio.dart';
+
+class BaseApi {
+  final Dio _dio;
+
+  static BaseApi? _authInstance, _nonAuthInstance;
+
+  final String url = 'https://arandu-user-service.onrender.com';
+
+  BaseApi._internal(bool auth) : _dio = Dio() {
+    _dio.options.baseUrl = url;
+    _dio.options.connectTimeout = const Duration(seconds: 5);
+    _dio.options.receiveTimeout = const Duration(seconds: 5);
+
+    if (auth) _dio.interceptors.add(AppInterceptors());
+
+    _dio.interceptors.add(LogInterceptor(
+        requestBody: true,
+        responseBody: true,
+        requestHeader: true,
+        error: true,
+        responseHeader: true,
+        request: true));
+  }
+
+  static BaseApi getInstance({required bool auth}) {
+    if (auth) {
+      return _authInstance ??= BaseApi._internal(auth);
+    } else {
+      return _nonAuthInstance ??= BaseApi._internal(auth);
+    }
+  }
+
+  Future<Response> get(
+      {required String path, Map<String, dynamic>? queryParameters}) async {
+    try {
+      return await _dio.get(path, queryParameters: queryParameters);
+    } catch (e) {
+      Log.e(e);
+      rethrow;
+    }
+  }
+
+  Future<Response> post({required String path, Object? data}) async {
+    try {
+      return await _dio.post(path, data: data);
+    } catch (e) {
+      Log.e(e);
+      rethrow;
+    }
+  }
+
+
+  Future<Response> patch({required String path, Object? data}) async {
+    try {
+      return await _dio.patch(path, data: data);
+    } catch (e) {
+      Log.e(e);
+      rethrow;
+    }
+  }
+
+
+
+  Future<Response> put({required String path, Object? data}) async {
+    try {
+      return await _dio.put(path, data: data);
+    } catch (e) {
+      Log.e(e);
+      rethrow;
+    }
+  }
+
+}
diff --git a/lib/core/network/token_manager/auth_service.dart b/lib/core/network/token_manager/auth_service.dart
new file mode 100644
index 0000000..44b103f
--- /dev/null
+++ b/lib/core/network/token_manager/auth_service.dart
@@ -0,0 +1,31 @@
+import 'package:aranduapp/core/data/local/StorageValue.dart';
+import 'package:aranduapp/core/log/Log.dart';
+import 'package:aranduapp/core/network/base_api.dart';
+import 'package:aranduapp/core/network/token_manager/model/refresh_token_response.dart';
+import 'package:dio/dio.dart';
+
+class AuthService {
+  Future<RefreshTokenResponse> refreshToken() async {
+    String? refresh = await StorageValue.getInstance().getRefreshToken();
+
+    assert(refresh != null);
+
+    Response response = await BaseApi.getInstance(auth: false).post(
+        path: '/auth/refresh',
+        data: <String, dynamic>{'refreshToken': refresh});
+
+    RefreshTokenResponse tokens =
+        RefreshTokenResponse.fromJsonString(response.toString());
+
+    await StorageValue.getInstance().setAuthToken(tokens.authToken!);
+    await StorageValue.getInstance().setRefreshToken(tokens.refreshToken!);
+
+    Log.i("Tokens atualizados com sucesso.");
+
+    return tokens;
+  }
+
+  Future<void> validateToken() async {
+    await BaseApi.getInstance(auth: true).get(path: '/auth/validate-token');
+  }
+}
diff --git a/lib/core/network/token_manager/model/refresh_token_response.dart b/lib/core/network/token_manager/model/refresh_token_response.dart
new file mode 100644
index 0000000..4691cfc
--- /dev/null
+++ b/lib/core/network/token_manager/model/refresh_token_response.dart
@@ -0,0 +1,18 @@
+import 'dart:convert';
+
+class RefreshTokenResponse {
+
+  String? authToken;
+  String? refreshToken;
+
+  RefreshTokenResponse(this.authToken, this.refreshToken);
+
+  factory RefreshTokenResponse.fromJsonString(String jsonString) {
+    Map<String, dynamic> json = jsonDecode(jsonString);
+    return RefreshTokenResponse(
+      json['accessToken'] as String?,
+      json['refreshToken'] as String?
+    );
+  }
+
+}
diff --git a/lib/core/state/command.dart b/lib/core/state/command.dart
new file mode 100644
index 0000000..29c64e6
--- /dev/null
+++ b/lib/core/state/command.dart
@@ -0,0 +1,47 @@
+import 'package:async/async.dart';
+import 'package:flutter/material.dart';
+
+abstract class Command<T> extends ChangeNotifier {
+  Result<T>? _result;
+
+  bool _running = false;
+
+  Command();
+
+  bool get isError => result?.asError != null;
+
+  bool get isOk => result?.asValue != null;
+
+  Result<T>? get result => _result;
+
+  bool get running => _running;
+
+  Future<void> _execute(action) async {
+    if (running) return;
+
+    _result = null;
+    _running = true;
+    notifyListeners();
+
+    try {
+      _result = await action();
+    } catch (e) {
+      _result = Result.error(e);
+    } finally {
+    _running = false;
+      notifyListeners();
+    }
+  }
+}
+
+class Command0<T> extends Command<T> {
+  final Future<Result<T>> Function() action;
+
+  Command0(this.action);
+
+  Future<Result<T>> execute() async {
+    await _execute(action);
+
+    return _result!;
+  }
+}
diff --git a/lib/main.dart b/lib/main.dart
index 1b423e4..e39bf39 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,5 +1,4 @@
 import 'package:aranduapp/config/ThemeApp.dart';
-import 'package:aranduapp/ui/login/view/LoginView.dart';
 import 'package:aranduapp/ui/welcome/view/WelcomeView.dart';
 import 'package:flutter/material.dart';
 
@@ -16,7 +15,7 @@ class MyApp extends StatelessWidget {
       theme: ThemeApp.themeData(),
       darkTheme: ThemeApp.darkThemeData(),
       debugShowCheckedModeBanner: false,
-      home: const Login(),
+      home: WelcomeView(),
     );
   }
 }
diff --git a/lib/ui/edit_password/model/edit_password_request.dart b/lib/ui/edit_password/model/edit_password_request.dart
new file mode 100644
index 0000000..5d6a45f
--- /dev/null
+++ b/lib/ui/edit_password/model/edit_password_request.dart
@@ -0,0 +1,28 @@
+import 'dart:convert';
+
+class EditPasswordRequest {
+  final String oldPassword;
+  final String newPassword;
+
+  EditPasswordRequest({
+    required this.oldPassword,
+    required this.newPassword,
+  });
+
+  Map<String, dynamic> toJson() {
+    return <String, dynamic>{
+      'oldPassword': oldPassword,
+      'newPassword': newPassword,
+    };
+  }
+
+  factory EditPasswordRequest.fromJsonString(String jsonString) {
+    final json = jsonDecode(jsonString);
+
+    return EditPasswordRequest(
+      oldPassword: json['oldPpassword']! as String,
+      newPassword: json['newPassword']! as String,
+    );
+  }
+}
+
diff --git a/lib/ui/edit_password/service/edit_password_service.dart b/lib/ui/edit_password/service/edit_password_service.dart
new file mode 100644
index 0000000..9cd8145
--- /dev/null
+++ b/lib/ui/edit_password/service/edit_password_service.dart
@@ -0,0 +1,12 @@
+import 'package:aranduapp/core/network/base_api.dart';
+import 'package:aranduapp/ui/edit_password/model/edit_password_request.dart';
+
+class EditPasswordService {
+
+  static Future<void> edit(EditPasswordRequest editPasswordRequest) async {
+    await BaseApi.getInstance(auth: true)
+        .put(path: '/auth/change-password', data: editPasswordRequest.toJson());
+  }
+  
+
+}
diff --git a/lib/ui/edit_password/view/edit_password_view.dart b/lib/ui/edit_password/view/edit_password_view.dart
new file mode 100644
index 0000000..933bd2f
--- /dev/null
+++ b/lib/ui/edit_password/view/edit_password_view.dart
@@ -0,0 +1,96 @@
+import 'package:aranduapp/ui/edit_password/viewmodel/edit_password_viewmode.dart';
+import 'package:aranduapp/ui/shared/requestbutton.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import 'package:aranduapp/ui/shared/TextPassword.dart';
+
+class EditPassword extends StatelessWidget {
+  const EditPassword({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider(
+      create: (context) => EditPasswordViewMode(),
+      child: const EditPasswordScreen(),
+    );
+  }
+}
+
+class EditPasswordScreen extends StatelessWidget {
+  const EditPasswordScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        appBar: AppBar(
+          backgroundColor: Theme.of(context).colorScheme.surface,
+          elevation: 0,
+          title: Center(
+            child: Text(
+              'Editar Senha',
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.onSurface,
+                fontSize: 24,
+              ),
+            ),
+          ),
+          leading: IconButton(
+            color: Theme.of(context).colorScheme.primary,
+            icon: const Icon(Icons.arrow_back),
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+          ),
+        ),
+        body: _buildForm(context));
+  }
+
+  Widget _buildForm(BuildContext context) {
+    return SingleChildScrollView(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        children: [
+          const SizedBox(height: 10),
+          _formSection(context),
+        ],
+      ),
+    );
+  }
+
+  Widget _formSection(BuildContext context) {
+    EditPasswordViewMode viewModel = Provider.of<EditPasswordViewMode>(context);
+
+    return Form(
+      key: viewModel.formKey,
+      child: Column(children: [
+        TextPassWord(
+            label: "Senha Antiga",
+            padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 20),
+            controller: viewModel.oldPasswordController),
+        TextPassWord(
+            label: "Senha Nova",
+            padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 20),
+            controller: viewModel.newPasswordController),
+        const SizedBox(height: 80),
+        _button(context, viewModel)
+      ]),
+    );
+  }
+
+  Widget _button(BuildContext context, EditPasswordViewMode viewModel) {
+    return Requestbutton(
+        command: viewModel.editCommand,
+        nameButton: "Enviar",
+        onErrorCallback: (e) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(e)),
+          );
+        },
+        onSuccessCallback: () {
+          ScaffoldMessenger.of(context).showSnackBar(
+            const SnackBar(content: Text('Senha atualizada com sucesso')),
+          );
+        });
+  }
+}
diff --git a/lib/ui/edit_password/viewmodel/edit_password_viewmode.dart b/lib/ui/edit_password/viewmodel/edit_password_viewmode.dart
new file mode 100644
index 0000000..c0ddfd0
--- /dev/null
+++ b/lib/ui/edit_password/viewmodel/edit_password_viewmode.dart
@@ -0,0 +1,34 @@
+import 'package:aranduapp/core/state/command.dart';
+import 'package:aranduapp/ui/edit_password/model/edit_password_request.dart';
+import 'package:aranduapp/ui/edit_password/service/edit_password_service.dart';
+import 'package:async/async.dart';
+import 'package:flutter/material.dart';
+
+class EditPasswordViewMode extends ChangeNotifier {
+  final GlobalKey<FormState> formKey;
+  final TextEditingController newPasswordController;
+  final TextEditingController oldPasswordController;
+
+  late Command0<void> editCommand;
+
+  EditPasswordViewMode()
+      : formKey = GlobalKey<FormState>(),
+        newPasswordController = TextEditingController(),
+        oldPasswordController = TextEditingController() {
+    editCommand = Command0<void>(editPassword);
+  }
+
+  Future<Result<void>> editPassword() async {
+    if (!formKey.currentState!.validate()) {
+      return Result.error(Exception('Valores inválidos'));
+    }
+
+    EditPasswordRequest request = EditPasswordRequest(
+        oldPassword: oldPasswordController.text,
+        newPassword: newPasswordController.text);
+
+    await EditPasswordService.edit(request);
+
+    return Result.value(null);
+  }
+}
diff --git a/lib/ui/edit_profile/model/EditProfileRequest.dart b/lib/ui/edit_profile/model/EditProfileRequest.dart
deleted file mode 100644
index b417b5f..0000000
--- a/lib/ui/edit_profile/model/EditProfileRequest.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'dart:convert';
-
-class EditProfileRequest {
-  final String? email;
-  final String? password;
-
-  EditProfileRequest(this.email, this.password);
-
-  factory EditProfileRequest.fromJsonString(String jsonString) {
-    Map<String, dynamic> json = jsonDecode(jsonString);
-    return EditProfileRequest(
-      json['email'] as String?,
-      json['password'] as String?,
-    );
-  }
-}
diff --git a/lib/ui/edit_profile/model/edit_profile_request.dart b/lib/ui/edit_profile/model/edit_profile_request.dart
new file mode 100644
index 0000000..2e808c4
--- /dev/null
+++ b/lib/ui/edit_profile/model/edit_profile_request.dart
@@ -0,0 +1,32 @@
+import 'dart:convert';
+
+class EditProfileRequest {
+  final String email;
+  final String name;
+  final String userName;
+
+  EditProfileRequest({
+    required this.email,
+    required this.name,
+    required this.userName,
+  });
+
+  Map<String, dynamic> toJson() {
+    return <String, dynamic>{
+      'name': name,
+      'email': email,
+      'username': userName,
+    };
+  }
+
+  factory EditProfileRequest.fromJsonString(String jsonString) {
+    final json = jsonDecode(jsonString);
+
+    return EditProfileRequest(
+      email: json['email']! as String,
+      name: json['name']! as String,
+      userName: json['userName']! as String,
+    );
+  }
+}
+
diff --git a/lib/ui/edit_profile/service/EditProfileService.dart b/lib/ui/edit_profile/service/EditProfileService.dart
deleted file mode 100644
index 3b621f8..0000000
--- a/lib/ui/edit_profile/service/EditProfileService.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'package:aranduapp/ui/edit_profile/model/EditProfileRequest.dart';
-import 'package:dio/dio.dart';
-
-class EditProfileService {
-  static Future<Response> edit(EditProfileRequest editProfileRequest) async {
-    // TODO: implement build
-    throw UnimplementedError();
-  }
-
-  static Future<EditProfileRequest> refreshToken() async {
-    // TODO: implement build
-    throw UnimplementedError();
-  }
-}
diff --git a/lib/ui/edit_profile/service/edit_profile_service.dart b/lib/ui/edit_profile/service/edit_profile_service.dart
new file mode 100644
index 0000000..5a948f5
--- /dev/null
+++ b/lib/ui/edit_profile/service/edit_profile_service.dart
@@ -0,0 +1,11 @@
+import 'package:aranduapp/core/network/base_api.dart';
+import 'package:aranduapp/ui/edit_profile/model/edit_profile_request.dart';
+
+class EditProfileService {
+  static Future<void> edit(EditProfileRequest editProfileRequest) async {
+
+    await BaseApi.getInstance(auth: true)
+        .patch(path: '/users', data: editProfileRequest.toJson());
+
+  }
+}
diff --git a/lib/ui/edit_profile/view/EditProfileView.dart b/lib/ui/edit_profile/view/EditProfileView.dart
deleted file mode 100644
index ec55fcb..0000000
--- a/lib/ui/edit_profile/view/EditProfileView.dart
+++ /dev/null
@@ -1,136 +0,0 @@
-import 'package:aranduapp/ui/shared/TextName.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-import 'package:aranduapp/ui/edit_profile/viewModel/EditProfileViewModel.dart';
-import 'package:aranduapp/ui/shared/TextEmail.dart';
-import 'package:aranduapp/ui/shared/TextPassword.dart';
-
-class EditProfile extends StatelessWidget {
-  const EditProfile({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return ChangeNotifierProvider(
-      create: (context) => EditProfileViewModel(context),
-      child: const EditProfileScreen(),
-    );
-  }
-}
-
-class EditProfileScreen extends StatefulWidget {
-  const EditProfileScreen({Key? key}) : super(key: key);
-
-  @override
-  State<EditProfileScreen> createState() => _EditProfileScreenState();
-}
-
-class _EditProfileScreenState extends State<EditProfileScreen> {
-
-  @override
-  Widget build(BuildContext context) {
-    final viewModel = Provider.of<EditProfileViewModel>(context);
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Editar Perfil'),
-      ),
-      body: _buildForm(viewModel)
-    );
-  }
-
-  Widget _buildForm(EditProfileViewModel viewModel) {
-    return SingleChildScrollView(
-      padding: const EdgeInsets.all(16.0),
-      child: Form(
-        key: viewModel.formKey,
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-
-            TextName(
-              controller: viewModel.firstNameController,
-              padding: const EdgeInsets.symmetric(vertical: 16)
-            ),
-
-            TextEmail(
-              padding: const EdgeInsets.symmetric(vertical: 16),
-              controller: viewModel.emailController,
-            ),
-
-            TextPassWord(
-              padding: const EdgeInsets.symmetric(vertical: 16),
-              controller: viewModel.passwordController,
-            ),
-
-            const SizedBox(height: 32),
-            _saveButton(viewModel),
-            const SizedBox(height: 16),
-            _deleteButton(context),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _saveButton(EditProfileViewModel viewModel) {
-    return ElevatedButton(
-      onPressed: () async {
-        if (viewModel.isLoading) return;
-        try {
-          await viewModel.editprofileWithEmailAndPassword();
-          ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(content: Text('Perfil atualizado com sucesso!')),
-          );
-        } catch (e) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(content: Text('Erro: $e')),
-          );
-        }
-      },
-
-      child: Consumer<EditProfileViewModel>(
-        builder: (context, value, child) => value.isLoading
-            ? const CircularProgressIndicator(value: null)
-            : const Text('Salvar'),
-      ),
-
-    );
-  }
-
-  Widget _deleteButton(BuildContext context) {
-    return ElevatedButton(
-      onPressed: () => _showDeleteConfirmationDialog(context),
-      child: const Text('Deletar Conta'),
-    );
-  }
-
-  void _showDeleteConfirmationDialog(BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: const Text('Confirmar Deleção'),
-          content: const Text(
-              'Tem certeza de que deseja deletar sua conta? Essa ação não pode ser desfeita.'),
-          actions: [
-            TextButton(
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
-              child: const Text('Cancelar'),
-            ),
-            ElevatedButton(
-              onPressed: () {
-                Navigator.of(context).pop();
-                ScaffoldMessenger.of(context).showSnackBar(
-                  const SnackBar(content: Text('Conta deletada com sucesso!')),
-                );
-              },
-              child: const Text('Deletar'),
-            ),
-          ],
-        );
-      },
-    );
-  }
-}
diff --git a/lib/ui/edit_profile/view/edit_profile_view.dart b/lib/ui/edit_profile/view/edit_profile_view.dart
new file mode 100644
index 0000000..3664156
--- /dev/null
+++ b/lib/ui/edit_profile/view/edit_profile_view.dart
@@ -0,0 +1,151 @@
+import 'package:aranduapp/ui/edit_profile/viewmodel/edit_profile_viewmodel.dart';
+import 'package:aranduapp/ui/shared/TextEmail.dart';
+import 'package:aranduapp/ui/shared/TextName.dart';
+import 'package:aranduapp/ui/shared/requestbutton.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class EditProfile extends StatelessWidget {
+  const EditProfile({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider(
+      create: (context) => EditProfileViewModel(),
+      child: const EditProfileScreen(),
+    );
+  }
+}
+
+class EditProfileScreen extends StatelessWidget {
+  const EditProfileScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    EditProfileViewModel viewModel = Provider.of<EditProfileViewModel>(context);
+
+    return Scaffold(
+
+        appBar: AppBar(
+          backgroundColor: Theme.of(context).colorScheme.surface,
+          elevation: 0,
+          title: Center(
+            child: Text(
+              'Editar perfil',
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.onSurface,
+                fontSize: 24,
+              ),
+            ),
+          ),
+          leading: IconButton(
+            color: Theme.of(context).colorScheme.primary,
+            icon: const Icon(Icons.arrow_back),
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+          ),
+        ),
+        body: SingleChildScrollView(
+          padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 20),
+          child: Column(
+            children: [
+              const SizedBox(height: 10),
+              _buildForm(context, viewModel),
+            ],
+          ),
+        ));
+
+  }
+
+  Widget _buildForm(BuildContext context, EditProfileViewModel viewModel) {
+    return Form(
+      key: viewModel.formKey,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          TextName(
+            controller: viewModel.nameController,
+            padding: const EdgeInsets.symmetric(vertical: 0),
+          ),
+          const SizedBox(height: 20),
+          TextName(
+            label: "Nome de Usuário",
+            controller: viewModel.userNameController,
+            padding: const EdgeInsets.symmetric(vertical: 0),
+          ),
+          const SizedBox(height: 20),
+          TextEmail(
+            padding: const EdgeInsets.symmetric(vertical: 0),
+            controller: viewModel.emailController,
+          ),
+          const SizedBox(height: 100),
+          _saveButton(context, viewModel),
+          const SizedBox(height: 20),
+          //         _deleteButton(context),
+        ],
+      ),
+    );
+  }
+
+
+  Widget _saveButton(BuildContext context, EditProfileViewModel viewModel) {
+    return Requestbutton(
+        command: viewModel.editCommand,
+        nameButton: "Salvar",
+        onErrorCallback: (e) {
+
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(content: Text(e)),
+
+          );
+        },
+        onSuccessCallback: () {
+          ScaffoldMessenger.of(context).showSnackBar(
+            const SnackBar(
+                content: Text(
+                    'Usuario atualizado com sucesso. ')),
+          );
+        });
+  }
+
+//Widget _deleteButton(BuildContext context) {
+//  return ElevatedButton(
+//    onPressed: () => _showDeleteConfirmationDialog(context),
+//    style: ElevatedButton.styleFrom(
+//      minimumSize: Size(0, 50),
+//    ),
+//    child: const Text('Deletar Conta'),
+//  );
+//}
+
+//void _showDeleteConfirmationDialog(BuildContext context) {
+//  showDialog(
+//    context: context,
+//    builder: (BuildContext context) {
+//      return AlertDialog(
+//        title: const Text('Confirmar Deleção'),
+//        content: const Text(
+//            'Tem certeza de que deseja deletar sua conta? Essa ação não pode ser desfeita.'),
+//        actions: [
+//          TextButton(
+//            onPressed: () {
+//              Navigator.of(context).pop();
+//            },
+//            child: const Text('Cancelar'),
+//          ),
+//          ElevatedButton(
+//            onPressed: () {
+//              Navigator.of(context).pop();
+//              ScaffoldMessenger.of(context).showSnackBar(
+//                const SnackBar(content: Text('Conta deletada com sucesso!')),
+//              );
+//            },
+//            child: const Text('Deletar'),
+//          ),
+//        ],
+//      );
+//    },
+//  );
+//}
+}
diff --git a/lib/ui/edit_profile/viewModel/EditProfileViewModel.dart b/lib/ui/edit_profile/viewModel/EditProfileViewModel.dart
deleted file mode 100644
index ca2e67d..0000000
--- a/lib/ui/edit_profile/viewModel/EditProfileViewModel.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-import 'package:flutter/material.dart';
-
-class EditProfileViewModel extends ChangeNotifier {
-  final BuildContext context;
-
-  bool isLoading;
-  final GlobalKey<FormState> formKey;
-  final TextEditingController firstNameController;
-  final TextEditingController lastNameController;
-  final TextEditingController emailController;
-  final TextEditingController passwordController;
-
-  // Inicialização dos campos no construtor
-  EditProfileViewModel(this.context)
-      : isLoading = false,
-        formKey = GlobalKey<FormState>(),
-        firstNameController = TextEditingController(),
-        lastNameController = TextEditingController(),
-        emailController = TextEditingController(),
-        passwordController = TextEditingController();
-
-  Future<void> editprofileWithEmailAndPassword() async {
-    if (isLoading) {
-      return;
-    }
-
-    try {
-      isLoading = true;
-      notifyListeners();
-
-      if (!formKey.currentState!.validate()) {
-        throw Exception('Valores inválidos');
-      }
-
-  
-      await Future.delayed(const Duration(seconds: 10));
-
-
-   // await EditProfileService.edit(
-   //     EditProfileRequest(emailController.text, passwordController.text));
-
-    } catch (e) {
-      rethrow;
-    } finally {
-      isLoading = false;
-      notifyListeners();
-    }
-  }
-
-}
diff --git a/lib/ui/edit_profile/viewmodel/edit_profile_viewmodel.dart b/lib/ui/edit_profile/viewmodel/edit_profile_viewmodel.dart
new file mode 100644
index 0000000..ceb77d3
--- /dev/null
+++ b/lib/ui/edit_profile/viewmodel/edit_profile_viewmodel.dart
@@ -0,0 +1,39 @@
+import 'package:aranduapp/core/state/command.dart';
+import 'package:aranduapp/ui/edit_profile/model/edit_profile_request.dart';
+import 'package:aranduapp/ui/edit_profile/service/edit_profile_service.dart';
+import 'package:async/async.dart';
+import 'package:flutter/material.dart';
+
+class EditProfileViewModel extends ChangeNotifier {
+  final GlobalKey<FormState> formKey;
+  final TextEditingController nameController;
+  final TextEditingController userNameController;
+  final TextEditingController emailController;
+
+  late Command0<void> editCommand;
+
+  EditProfileViewModel()
+      : formKey = GlobalKey<FormState>(),
+        nameController = TextEditingController(),
+        userNameController = TextEditingController(),
+        emailController = TextEditingController() {
+
+    editCommand = Command0<void>(editprofile);
+
+  }
+
+  Future<Result<void>> editprofile() async {
+    if (!formKey.currentState!.validate()) {
+      return Result.error(Exception('Valores inválidos' ));
+    }
+
+    EditProfileRequest request = EditProfileRequest(
+        name: nameController.text,
+        userName: userNameController.text,
+        email: emailController.text);
+
+    await EditProfileService.edit(request);
+
+    return Result.value(null);
+  }
+}
diff --git a/lib/ui/home/view/HomeView.dart b/lib/ui/home/view/HomeView.dart
index 210af0a..e9a1c38 100644
--- a/lib/ui/home/view/HomeView.dart
+++ b/lib/ui/home/view/HomeView.dart
@@ -5,8 +5,7 @@ class HomeView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // TODO: implement build
-    throw UnimplementedError();
+    return const Text('Home', style: TextStyle(fontSize: 20));
   }
 
   
diff --git a/lib/ui/login/model/LoginResponse.dart b/lib/ui/login/model/LoginResponse.dart
index 1ffdc7b..18b17c2 100644
--- a/lib/ui/login/model/LoginResponse.dart
+++ b/lib/ui/login/model/LoginResponse.dart
@@ -2,8 +2,8 @@ import 'dart:convert';
 
 class LoginResponse {
 
-  String? authToken;
-  String? refreshToken;
+  String authToken;
+  String refreshToken;
 
   LoginResponse(this.authToken, this.refreshToken);
 
@@ -11,8 +11,8 @@ class LoginResponse {
   factory LoginResponse.fromJsonString(String jsonString) {
     Map<String, dynamic> json = jsonDecode(jsonString);
     return LoginResponse(
-      json['accessToken'] as String?,
-      json['refreshToken'] as String?
+      json['accessToken']! as String,
+      json['refreshToken']! as String
     );
   }
 
diff --git a/lib/ui/login/service/LoginService.dart b/lib/ui/login/service/LoginService.dart
index fe47264..0d85360 100644
--- a/lib/ui/login/service/LoginService.dart
+++ b/lib/ui/login/service/LoginService.dart
@@ -1,42 +1,33 @@
 import 'package:aranduapp/core/data/local/StorageValue.dart';
 import 'package:aranduapp/core/log/Log.dart';
-import 'package:aranduapp/core/network/BaseApi.dart';
+import 'package:aranduapp/core/network/base_api.dart';
+import 'package:aranduapp/core/network/token_manager/auth_service.dart';
 import 'package:aranduapp/ui/login/model/LoginRequest.dart';
 import 'package:aranduapp/ui/login/model/LoginResponse.dart';
 import 'package:dio/dio.dart';
 
 class LoginService {
-
   static Future<Response> login(LoginRequest loginRequest) async {
-
     Log.d('${loginRequest.email} ${loginRequest.password}');
 
-    Response response = await BaseApi.getInstance().post(
-      path: '/auth/login',
-      data: <String, dynamic> {
-        'email' : loginRequest.email,
-        'password': loginRequest.password
-      }
-    );
-
-    LoginResponse loginResponse = LoginResponse.fromJsonString(response.toString());
+    Response response = await BaseApi.getInstance(auth: false).post(
+        path: '/auth/login',
+        data: <String, dynamic>{
+          'email': loginRequest.email,
+          'password': loginRequest.password
+        });
 
-    assert(loginResponse.authToken != null && loginResponse.refreshToken != null);
-
-    await StorageValue.getInstance().setAuthToken(loginResponse.authToken ?? '');
-    await StorageValue.getInstance().setAuthToken(loginResponse.refreshToken??'');
+    LoginResponse loginResponse =
+        LoginResponse.fromJsonString(response.toString());
 
+    await StorageValue.getInstance().setAuthToken(loginResponse.authToken);
+    await StorageValue.getInstance()
+        .setRefreshToken(loginResponse.refreshToken);
 
     return response;
-
   }
 
-  static Future<LoginRequest> refreshToken() async {
-    // TODO: implement build
-    throw UnimplementedError();
-
+  static Future<void> validateToken() async {
+    await AuthService().refreshToken();
   }
-
 }
-
-
diff --git a/lib/ui/login/view/LoginView.dart b/lib/ui/login/view/login_view.dart
similarity index 61%
rename from lib/ui/login/view/LoginView.dart
rename to lib/ui/login/view/login_view.dart
index 8ae71f6..0481108 100644
--- a/lib/ui/login/view/LoginView.dart
+++ b/lib/ui/login/view/login_view.dart
@@ -1,14 +1,15 @@
 import 'package:aranduapp/core/log/Log.dart';
-import 'package:aranduapp/ui/home/view/HomeView.dart';
+import 'package:aranduapp/ui/navbar/view/navBarView.dart';
 import 'package:aranduapp/ui/shared/TextAndLink.dart';
+import 'package:aranduapp/ui/shared/requestbutton.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
-import 'package:aranduapp/ui/login/viewModel/LoginViewModel.dart';
+import 'package:aranduapp/ui/login/viewModel/login_view_model.dart';
 
-import 'package:aranduapp/ui/recover_account/view/RecoverAccount.dart';
-import 'package:aranduapp/ui/register_account/view/RegisterAccount.dart';
+import 'package:aranduapp/ui/recover_account/view/recover_account_view.dart';
+import 'package:aranduapp/ui/register_account/view/register_account_view.dart';
 
 import 'package:aranduapp/ui/shared/TitleSlogan.dart';
 import 'package:aranduapp/ui/shared/TextEmail.dart';
@@ -22,57 +23,52 @@ class Login extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ChangeNotifierProvider(
-      create: (context) => LoginViewModel(context),
-      child: const _Login(),
+      create: (context) => LoginViewModel(),
+      child: const LoginScreen(),
     );
   }
 }
 
-class _Login extends StatefulWidget {
-  const _Login({super.key});
-
-  @override
-  State<StatefulWidget> createState() {
-    return _LoginState();
-  }
-}
-
-class _LoginState extends State<_Login> {
-  late Future<void> _future;
-
-  @override
-  void initState() {
-    super.initState();
-    _future = Provider.of<LoginViewModel>(context, listen: false)
-        .getRefreshTokenFuture();
-  }
+class LoginScreen extends StatelessWidget {
+  const LoginScreen({super.key});
 
   @override
   Widget build(BuildContext context) {
     LoginViewModel viewModel = Provider.of<LoginViewModel>(context);
 
     return Scaffold(
-        body: FutureBuilder(
-            future: _future,
-            builder: (context, snapshot) {
-              if (snapshot.connectionState == ConnectionState.waiting) {
-                return _loadingScreen(viewModel);
-              } else if (!snapshot.hasError) {
-                viewModel.loginWithDeviceAuth();
-                return _authDevice(viewModel);
-              } else {
-                return _emailAndPassword(viewModel);
-              }
-            }));
+      body: ListenableBuilder(
+        listenable: viewModel.validadeTokenCommand,
+        builder: (context, child) {
+          if (viewModel.validadeTokenCommand.isOk) {
+            return _authDevice(viewModel, context);
+          } else if (viewModel.validadeTokenCommand.isError) {
+            return _emailAndPassword(viewModel, context);
+          } else {
+            return _loadingScreen(viewModel, context);
+          }
+        },
+      ),
+    );
   }
 
-  Widget _loadingScreen(LoginViewModel viewModel) {
+  Widget _loadingScreen(LoginViewModel viewModel, BuildContext context) {
     return const Center(
       child: CircularProgressIndicator(value: null),
     );
   }
 
-  Widget _authDevice(LoginViewModel viewModel) {
+  Widget _authDevice(LoginViewModel viewModel, BuildContext context) {
+    Log.d("Mostrando tela de autorização do dispositivo");
+
+    viewModel.loginWithDeviceAuth().then((ok) {
+      if (ok) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          goToNavbar(context);
+        });
+      }
+    });
+
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       children: <Widget>[
@@ -91,8 +87,12 @@ class _LoginState extends State<_Login> {
             width: 291,
             height: 64,
             child: ElevatedButton(
-              onPressed: () {
-                viewModel.loginWithDeviceAuth();
+              onPressed: () async {
+                viewModel.loginWithDeviceAuth().then((ok) {
+                  WidgetsBinding.instance.addPostFrameCallback((_) {
+                    goToNavbar(context);
+                  });
+                });
               },
               child: const Text('Usar senha do celular'),
             ),
@@ -102,7 +102,7 @@ class _LoginState extends State<_Login> {
     );
   }
 
-  Widget _emailAndPassword(LoginViewModel viewModel) {
+  Widget _emailAndPassword(LoginViewModel viewModel, BuildContext context) {
     return SingleChildScrollView(
       child: Column(
         mainAxisAlignment: MainAxisAlignment.start,
@@ -112,11 +112,11 @@ class _LoginState extends State<_Login> {
           const SizedBox(height: 80),
           const SizedBox(height: 10),
           _formSection(viewModel),
-          _forgotPasswordLink(),
+          _forgotPasswordLink(context),
           const SizedBox(height: 80),
-          _loginButtonSection(),
+          _loginButtonSection(context),
           const OrDivider(),
-          _loggingInWithOther(),
+          _loggingInWithOther(context),
           TextAndLink(
               text: 'É novo pro aqui?',
               link: 'Cria a sua conta',
@@ -149,7 +149,7 @@ class _LoginState extends State<_Login> {
     );
   }
 
-  Widget _forgotPasswordLink() {
+  Widget _forgotPasswordLink(BuildContext context) {
     return GestureDetector(
       onTap: () {
         Navigator.of(context).push(
@@ -174,35 +174,24 @@ class _LoginState extends State<_Login> {
     );
   }
 
-  Widget _loginButtonSection() {
+  Widget _loginButtonSection(BuildContext context) {
     LoginViewModel viewModel = Provider.of<LoginViewModel>(context);
 
-    return SizedBox(
-      width: 291,
-      height: 64,
-      child: ElevatedButton(
-          onPressed: () {
-            viewModel.loginWithEmailAndPassword().then((_) {
-              Navigator.of(context).pushReplacement(
-                MaterialPageRoute(
-                  builder: (context) => const HomeView(),
-                ),
-              );
-            }).catchError((e) => showDialog<Object>(
-                  context: context,
-                  builder: (BuildContext context) =>
-                      ErrorPopUp(content: Text('$e')),
-                ));
-          },
-          child: Consumer<LoginViewModel>(
-            builder: (context, value, child) => value.isLoading
-                ? const CircularProgressIndicator(value: null)
-                : const Text('Entrar'),
-          )),
-    );
+    return Requestbutton(
+        command: viewModel.loginCommand,
+        onErrorCallback: (String e) {
+          showDialog<Object>(
+            context: context,
+            builder: (BuildContext context) => ErrorPopUp(content: Text(e)),
+          );
+        },
+        onSuccessCallback: () {
+          goToNavbar(context);
+        },
+        nameButton: 'Entrar');
   }
 
-  Widget _loggingInWithOther() {
+  Widget _loggingInWithOther(BuildContext context) {
     return GestureDetector(
       onTap: () => Log.d(""),
       child: Container(
@@ -221,4 +210,12 @@ class _LoginState extends State<_Login> {
       ),
     );
   }
+
+  void goToNavbar(BuildContext context) {
+    Navigator.of(context).pushReplacement(
+      MaterialPageRoute(
+        builder: (context) => const NavbarView(),
+      ),
+    );
+  }
 }
diff --git a/lib/ui/login/viewModel/LoginViewModel.dart b/lib/ui/login/viewModel/LoginViewModel.dart
deleted file mode 100644
index 137b386..0000000
--- a/lib/ui/login/viewModel/LoginViewModel.dart
+++ /dev/null
@@ -1,70 +0,0 @@
-
-import 'package:flutter/material.dart';
-import 'package:local_auth/local_auth.dart';
-import 'package:aranduapp/ui/login/service/LoginService.dart';
-import 'package:aranduapp/ui/login/model/LoginRequest.dart';
-
-import 'package:aranduapp/ui/home/view/HomeView.dart';
-
-class LoginViewModel extends ChangeNotifier {
-
-  final BuildContext context;
-  
-  bool isLoading;
-
-  final GlobalKey<FormState> formKey;
-  final TextEditingController emailController;
-  final TextEditingController passwordController;
-
-  LoginViewModel(this.context) :
-    isLoading = false,
-    formKey = GlobalKey<FormState>(),
-    emailController = TextEditingController(),
-    passwordController = TextEditingController();
-
-  
-  
-  Future<void> loginWithEmailAndPassword() async {
-
-    // TODO use mutex to make this
-    if (isLoading){
-      return;
-    }
-
-    try {
-      isLoading = true;
-      super.notifyListeners();
-
-      if (!formKey.currentState!.validate()) {
-        throw Exception('Valores inválidos');
-      }
-
-      await LoginService.login(LoginRequest(emailController.text, passwordController.text));
-
-    } catch (e) {
-      rethrow;
-    } finally {
-      isLoading = false;
-      notifyListeners();
-    }
-  }
-
-  Future<void> getRefreshTokenFuture() async {
-    // TODO
-    //return await LoginService.refreshToken();
-    throw UnimplementedError();
-  }
-
- Future<void> loginWithDeviceAuth() async {
-    bool value =  await LocalAuthentication().authenticate(
-      localizedReason: 'Toque com o dedo no sensor para logar');
-
-      if (!value) 
-        throw Exception();
-      
-   }
-
-
-
-}
-
diff --git a/lib/ui/login/viewModel/login_view_model.dart b/lib/ui/login/viewModel/login_view_model.dart
new file mode 100644
index 0000000..d8a755a
--- /dev/null
+++ b/lib/ui/login/viewModel/login_view_model.dart
@@ -0,0 +1,52 @@
+import 'package:aranduapp/core/log/Log.dart';
+import 'package:aranduapp/core/state/command.dart';
+import 'package:aranduapp/ui/navbar/view/navBarView.dart';
+import 'package:async/async.dart';
+import 'package:flutter/material.dart';
+import 'package:local_auth/local_auth.dart';
+import 'package:aranduapp/ui/login/service/LoginService.dart';
+import 'package:aranduapp/ui/login/model/LoginRequest.dart';
+
+class LoginViewModel extends ChangeNotifier {
+
+  late Command0<void> loginCommand;
+  late Command0<void> validadeTokenCommand;
+
+  final GlobalKey<FormState> formKey;
+  final TextEditingController emailController;
+  final TextEditingController passwordController;
+
+  LoginViewModel()
+      : formKey = GlobalKey<FormState>(),
+        emailController = TextEditingController(),
+        passwordController = TextEditingController() {
+
+    loginCommand = Command0<void>(loginWithEmailAndPassword);
+
+    validadeTokenCommand = Command0<void>(validateToken);
+    validadeTokenCommand.execute();
+  }
+
+  Future<Result<void>> loginWithEmailAndPassword() async {
+    if (!formKey.currentState!.validate()) {
+      return Result.error(Exception('Valores inválidos'));
+    }
+
+    await LoginService.login(
+        LoginRequest(emailController.text, passwordController.text));
+
+    return Result.value(null);
+  }
+
+  Future<Result<void>> validateToken() async {
+    await LoginService.validateToken();
+
+    return Result.value(null);
+  }
+
+  Future<bool> loginWithDeviceAuth() async {
+    Log.d('init loginWithDeviceAuth');
+    return await LocalAuthentication()
+        .authenticate(localizedReason: 'Toque com o dedo no sensor para logar');
+  }
+}
diff --git a/lib/ui/navbar/model/navBarViewModel.dart b/lib/ui/navbar/model/navBarViewModel.dart
new file mode 100644
index 0000000..712c4d4
--- /dev/null
+++ b/lib/ui/navbar/model/navBarViewModel.dart
@@ -0,0 +1,12 @@
+import 'package:flutter/material.dart';
+
+class NavbarViewModel extends ChangeNotifier {
+  int _selectedIndex = 0;
+
+  int get selectedIndex => _selectedIndex;
+
+  void changeTab(int index) {
+    _selectedIndex = index;
+    notifyListeners();
+  }
+}
diff --git a/lib/ui/navbar/view/navBarView.dart b/lib/ui/navbar/view/navBarView.dart
new file mode 100644
index 0000000..2460990
--- /dev/null
+++ b/lib/ui/navbar/view/navBarView.dart
@@ -0,0 +1,60 @@
+import 'package:aranduapp/ui/home/view/HomeView.dart';
+import 'package:aranduapp/ui/profile/view/ProfileView.dart';
+//import 'package:aranduapp/ui/profile/view/profileView.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:aranduapp/ui/navbar/model/navBarViewModel.dart';
+
+class NavbarView extends StatelessWidget {
+  const NavbarView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: ChangeNotifierProvider(
+          create: (context) => NavbarViewModel(),
+          builder: (context, child) {
+            return page(context);
+          }),
+    );
+  }
+}
+
+Widget page(BuildContext context) {
+  NavbarViewModel viewModel = Provider.of<NavbarViewModel>(context);
+
+  final List<Widget> pages = [
+    const HomeView(),
+    const Center(child: Text('Friends', style: TextStyle(fontSize: 20))),
+    const Center(child: Text('Dashbord', style: TextStyle(fontSize: 20))),
+    const Profile(),
+  ];
+
+  return Scaffold(
+    body: pages[viewModel.selectedIndex],
+    bottomNavigationBar: BottomNavigationBar(
+      currentIndex: viewModel.selectedIndex,
+      onTap: viewModel.changeTab,
+      selectedItemColor: Theme.of(context).colorScheme.primary,
+      unselectedItemColor: Theme.of(context).colorScheme.onSurface,
+      items: const [
+        BottomNavigationBarItem(
+          icon: Icon(Icons.home_outlined),
+          label: "Home",
+        ),
+        BottomNavigationBarItem(
+          icon: Icon(Icons.groups_outlined),
+          label: "Amigos",
+        ),
+        BottomNavigationBarItem(
+          icon: Icon(Icons.bar_chart),
+          label: "Dashboard",
+        ),
+        BottomNavigationBarItem(
+          icon: Icon(Icons.person_outline),
+          label: "Perfil",
+        ),
+      ],
+    ),
+  );
+}
diff --git a/lib/ui/onboarding/view/onboarding_view.dart b/lib/ui/onboarding/view/onboarding_view.dart
index 63a6604..8f06575 100644
--- a/lib/ui/onboarding/view/onboarding_view.dart
+++ b/lib/ui/onboarding/view/onboarding_view.dart
@@ -1,20 +1,11 @@
-// lib/view/onboarding_page.dart
 import 'package:flutter/material.dart';
-import 'package:aranduapp/ui/register_account/view/RegisterAccount.dart';
-import 'package:google_fonts/google_fonts.dart';
+import 'package:provider/provider.dart';
+import '../viewModel/onboarding_view_model.dart';
 
-class OnboardingView extends StatefulWidget {
+class OnboardingView extends StatelessWidget {
   const OnboardingView({super.key});
 
-  @override
-  _OnboardingViewState createState() => _OnboardingViewState();
-}
-
-class _OnboardingViewState extends State<OnboardingView> {
-  final PageController _pageController = PageController();
-  int _currentPage = 0;
-
-  final List<Map<String, String>> steps = [
+  final List<Map<String, String>> steps = const [
     {
       'title': 'Bem-Vindo(a)!',
       'description':
@@ -35,93 +26,96 @@ class _OnboardingViewState extends State<OnboardingView> {
     },
   ];
 
-  void _goToNextPage() {
-    if (_currentPage < steps.length - 1) {
-      _pageController.nextPage(
-        duration: const Duration(milliseconds: 300),
-        curve: Curves.easeIn,
-      );
-    }
-  }
-
-  void _goToPreviousPage() {
-    if (_currentPage > 0) {
-      _pageController.previousPage(
-        duration: const Duration(milliseconds: 300),
-        curve: Curves.easeIn,
-      );
-    }
-  }
-
   @override
-  void initState() {
-    super.initState();
-    _pageController.addListener(() {
-      int page = _pageController.page?.toInt() ?? 0;
-      if (_currentPage != page) {
-        setState(() {
-          _currentPage = page;
-        });
-      }
-    });
-  }
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider(
+      create: (_) => OnboardingViewModel(),
+      child: Consumer<OnboardingViewModel>(
+        builder: (context, viewModel, _) {
+          return Scaffold(
+            appBar: null,
+            body: LayoutBuilder(
+              builder: (context, constraints) {
+                final double imageHeight = constraints.maxHeight * 0.60;
+                final double contentHeight = constraints.maxHeight * 0.55;
+                final double buttonHeight = constraints.maxHeight * 0.15;
 
-  @override
-  void dispose() {
-    _pageController.dispose();
-    super.dispose();
+                return Stack(
+                  children: [
+                    _buildSemicirclePage(context),
+                    _buildImageSection(viewModel, steps, imageHeight),
+                    _buildContentSection(viewModel, steps, contentHeight),
+                    _buildNavigationButtons(
+                        context, viewModel, steps, buttonHeight),
+                  ],
+                );
+              },
+            ),
+          );
+        },
+      ),
+    );
   }
 
-  Widget _buildOnboardingImage(String imageAsset) {
+  Widget _buildImageSection(OnboardingViewModel viewModel,
+      List<Map<String, String>> steps, double height) {
     return Positioned(
       top: 0,
       left: 0,
       right: 0,
-      child: Container(
-        height: MediaQuery.of(context).size.height * 0.6,
-        width: double.infinity,
-        decoration: BoxDecoration(
-          image: DecorationImage(
-            image: AssetImage(imageAsset),
-            fit: BoxFit.cover,
+      height: height,
+      child: AnimatedSwitcher(
+        duration: const Duration(seconds: 1),
+        transitionBuilder: (Widget child, Animation<double> animation) {
+          return FadeTransition(opacity: animation, child: child);
+        },
+        child: Container(
+          key: ValueKey<String>(steps[viewModel.currentPage]['imageAsset']!),
+          decoration: BoxDecoration(
+            image: DecorationImage(
+              image: AssetImage(steps[viewModel.currentPage]['imageAsset']!),
+              fit: BoxFit.cover,
+            ),
           ),
         ),
       ),
     );
   }
 
-  Widget _buildOnboardingSteps() {
+  Widget _buildContentSection(OnboardingViewModel viewModel,
+      List<Map<String, String>> steps, double height) {
     return Positioned(
-      top: MediaQuery.of(context).size.height * 0.6,
+      top: height,
       left: 0,
       right: 0,
-      bottom: 0,
+      height: height,
       child: PageView.builder(
-        controller: _pageController,
+        controller: viewModel.pageController,
         itemCount: steps.length,
+        onPageChanged: viewModel.updateCurrentPage,
         itemBuilder: (context, index) {
           final step = steps[index];
           return Padding(
-            padding: const EdgeInsets.all(16.0),
+            padding: const EdgeInsets.symmetric(horizontal: 16.0),
             child: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.start,
-              children: <Widget>[
+              children: [
                 Text(
                   step['title']!,
-                  style: GoogleFonts.comfortaa(
-                    fontSize: 30,
-                    fontWeight: FontWeight.bold,
-                  ),
-                  textAlign: TextAlign.start,
+                  style: Theme.of(context).textTheme.headlineMedium?.copyWith(
+                        fontWeight: FontWeight.bold,
+                      ),
+                  textAlign: TextAlign.justify,
                 ),
                 const SizedBox(height: 20),
-                Text(
-                  step['description']!,
-                  style: GoogleFonts.comfortaa(
-                    fontSize: 18,
+                Expanded(
+                  child: SingleChildScrollView(
+                    child: Text(
+                      step['description']!,
+                      style: Theme.of(context).textTheme.bodyLarge,
+                      textAlign: TextAlign.justify,
+                    ),
                   ),
-                  textAlign: TextAlign.justify,
                 ),
               ],
             ),
@@ -131,93 +125,82 @@ class _OnboardingViewState extends State<OnboardingView> {
     );
   }
 
-  Widget _buildNavigationButtons() {
+  Widget _buildSemicirclePage(BuildContext context) {
     return Positioned(
-      bottom: 48,
-      left: 0,
-      right: 0,
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.end, // Alinha os botões à direita
-        children: [
-          // Botão de voltar (aparece apenas se não estiver na primeira página)
-          if (_currentPage > 0)
-            Padding(
-              padding: const EdgeInsets.only(left: 0),
-              child: FloatingActionButton(
-                onPressed: _goToPreviousPage,
-                mini: true,
-                backgroundColor: Theme.of(context).colorScheme.primary,
-                child: const Icon(
-                  Icons.arrow_back,
-                  color: Colors.white,
-                ),
-              ),
-            ),
-          SizedBox(width: 10),
-          // Botão de avançar (sempre à direita)
-          Padding(
-            padding: const EdgeInsets.only(right: 30),
-            child: FloatingActionButton(
-              onPressed: _goToNextPage,
-              mini: true,
-              backgroundColor: Theme.of(context).colorScheme.primary,
-              child: const Icon(
-                Icons.arrow_forward,
-                color: Colors.white,
-              ),
-            ),
+      top: 0,
+      left: -MediaQuery.of(context).size.width * 0.3, // Desloca para a esquerda
+      child: Container(
+        width:
+            MediaQuery.of(context).size.width * 1.3, // Largura maior que a tela
+        height:
+            MediaQuery.of(context).size.height * 0.4, // Altura do semicírculo
+        decoration: BoxDecoration(
+          color: Theme.of(context).colorScheme.primary,
+          borderRadius: BorderRadius.only(
+            bottomLeft:
+                Radius.circular(MediaQuery.of(context).size.height * 0.5),
+            bottomRight:
+                Radius.circular(MediaQuery.of(context).size.height * 0.5),
           ),
-        ],
+        ),
       ),
     );
   }
 
-  Widget _buildStartButton() {
+  Widget _buildNavigationButtons(
+      BuildContext context,
+      OnboardingViewModel viewModel,
+      List<Map<String, String>> steps,
+      double height) {
     return Positioned(
-      bottom: 50,
-      right: 30,
-      child: SizedBox(
-        width: 150,
-        height: 48,
-        child: ElevatedButton(
-          style: ElevatedButton.styleFrom(
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(8),
-            ),
-            backgroundColor: Theme.of(context).colorScheme.primary,
-          ),
-          onPressed: () {
-            Navigator.pushReplacement(
-              context,
-              MaterialPageRoute(
-                builder: (context) => const RegisterAccount(),
+      bottom: 0,
+      left: 0,
+      right: 0,
+      height: height,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 20),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            if (viewModel.currentPage < steps.length - 1)
+              TextButton(
+                onPressed: () => viewModel.navigateToNextPage(context),
+                child: Text(
+                  'Pular',
+                  style: Theme.of(context).textTheme.bodyLarge?.apply(
+                        color: Theme.of(context).colorScheme.secondary,
+                      ),
+                ),
               ),
-            );
-          },
-          child: const Text(
-            'Começar',
-            style: TextStyle(
-              color: Colors.white,
-              fontWeight: FontWeight.bold,
-            ),
-          ),
+            if (viewModel.currentPage < steps.length - 1)
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: Theme.of(context).colorScheme.primary,
+                ),
+                onPressed: viewModel.goToNextPage,
+                child: Text(
+                  'Avançar',
+                  style: Theme.of(context).textTheme.bodyLarge?.apply(
+                        color: Theme.of(context).colorScheme.onPrimary,
+                      ),
+                ),
+              ),
+            if (viewModel.currentPage == steps.length - 1)
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: Theme.of(context).colorScheme.primary,
+                ),
+                onPressed: () => viewModel.navigateToNextPage(context),
+                child: Text(
+                  'Começar',
+                  style: Theme.of(context).textTheme.bodyLarge?.apply(
+                        color: Theme.of(context).colorScheme.onPrimary,
+                      ),
+                ),
+              ),
+          ],
         ),
       ),
     );
   }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: null,
-      body: Stack(
-        children: [
-          _buildOnboardingImage(steps[_currentPage]['imageAsset']!),
-          _buildOnboardingSteps(),
-          _buildNavigationButtons(),
-          if (_currentPage == steps.length - 1) _buildStartButton(),
-        ],
-      ),
-    );
-  }
 }
diff --git a/lib/ui/onboarding/viewModel/onboarding_view_model.dart b/lib/ui/onboarding/viewModel/onboarding_view_model.dart
index a384a3f..43fb6a7 100644
--- a/lib/ui/onboarding/viewModel/onboarding_view_model.dart
+++ b/lib/ui/onboarding/viewModel/onboarding_view_model.dart
@@ -1,31 +1,26 @@
-// lib/view_model/onboarding_view_model.dart
+import 'package:aranduapp/ui/login/view/login_view.dart';
 import 'package:flutter/material.dart';
 
 class OnboardingViewModel extends ChangeNotifier {
-  int _currentStep = 0;
+  final PageController pageController = PageController();
+  int currentPage = 0;
 
-  // Dados do onboarding removidos
-
-  int get currentStep => _currentStep;
-  int get totalSteps => 3; // Definindo um número fixo de etapas
-
-  void nextStep() {
-    if (_currentStep < totalSteps - 1) {
-      _currentStep++;
-      notifyListeners();
-    }
+  void goToNextPage() {
+    pageController.nextPage(
+      duration: const Duration(milliseconds: 300),
+      curve: Curves.easeIn,
+    );
   }
 
-  void previousStep() {
-    if (_currentStep > 0) {
-      _currentStep--;
-      notifyListeners();
-    }
+  void updateCurrentPage(int page) {
+    currentPage = page;
+    notifyListeners();
   }
 
-  void completeOnboarding() {
-    // Aqui você pode armazenar o estado para indicar que o onboarding foi concluído.
-    // Por exemplo, usando SharedPreferences ou outro armazenamento local.
-    print("Onboarding concluído!");
+  void navigateToNextPage(BuildContext context) {
+    Navigator.pushReplacement(
+      context,
+      MaterialPageRoute(builder: (context) => const Login()),
+    );
   }
 }
diff --git a/lib/ui/profile/view/ProfileView.dart b/lib/ui/profile/view/ProfileView.dart
new file mode 100644
index 0000000..5af2483
--- /dev/null
+++ b/lib/ui/profile/view/ProfileView.dart
@@ -0,0 +1,144 @@
+import 'package:aranduapp/ui/edit_password/view/edit_password_view.dart';
+import 'package:provider/provider.dart';
+import 'package:flutter/material.dart';
+
+import 'package:aranduapp/ui/shared/ProfileHeader.dart';
+import 'package:aranduapp/ui/profile/viewModel/ProfileViewModel.dart';
+import 'package:aranduapp/ui/edit_profile/view/edit_profile_view.dart';
+
+class Profile extends StatelessWidget {
+  const Profile({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: _buildAppBar(context),
+      body: ChangeNotifierProvider(
+        create: (context) => ProfileViewModel(context),
+        builder: (context, child) {
+          return _buildPage(context);
+        },
+      ),
+    );
+  }
+
+  /// AppBar
+  AppBar _buildAppBar(BuildContext context) {
+    return AppBar(
+      backgroundColor: Theme.of(context).colorScheme.onPrimary,
+      scrolledUnderElevation: 0,
+      title: Text(
+        'Perfil',
+        style: Theme.of(context).textTheme.headlineSmall?.copyWith(
+              color: Theme.of(context).colorScheme.onSurface,
+            ),
+      ),
+      centerTitle: true,
+      actions: [
+        Padding(
+          padding: const EdgeInsets.only(right: 16.0),
+          child: Container(
+            child: Center(
+              child: Icon(
+                Icons.notifications_none_outlined,
+                color: Theme.of(context).colorScheme.primary,
+                size: 32,
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  /// Página principal
+  Widget _buildPage(BuildContext context) {
+    return SingleChildScrollView(
+      child: Center(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            _buildProfileHeader(context),
+            const SizedBox(height: 80),
+            _setting(context),
+          ],
+        ),
+      ),
+    );
+  }
+
+  /// Cabeçalho do Perfil
+  Widget _buildProfileHeader(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        ProfileHeader(
+          name: "Stefani",
+          role: "Estudante",
+        ),
+        Padding(
+          padding: const EdgeInsets.only(right: 16.0),
+          child: ElevatedButton(
+            onPressed: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(builder: (context) => const EditProfile()),
+              );
+            },
+            style: ElevatedButton.styleFrom(
+              backgroundColor: Theme.of(context).colorScheme.primary,
+              padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+              elevation: 2,
+            ),
+            child: Text(
+              "Editar",
+              style: Theme.of(context).textTheme.bodySmall!.apply(
+                    color: Theme.of(context).colorScheme.onPrimary,
+                  ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+
+  Widget _setting(BuildContext context) {
+    return Card(
+      child: Column(
+        children: [
+          ListTile(
+            leading: Icon(
+              Icons.lock_reset,
+              color: Theme.of(context).colorScheme.primary,
+              size: 32,
+            ),
+            title: const Text('Trocar senha'),
+            trailing: Icon(
+              Icons.chevron_right,
+              color: Theme.of(context).colorScheme.primary,
+              size: 32,
+            ),
+            onTap: () {
+              Navigator.of(context).push(
+                MaterialPageRoute(
+                  builder: (context) => const EditPassword(),
+                ),
+              );
+            },
+          ),
+          const Divider(),
+          ListTile(
+            leading: Icon(
+              Icons.logout_sharp,
+              color: Theme.of(context).colorScheme.error,
+              size: 32,
+            ),
+            title: const Text('Sair'),
+            onTap: () {},
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/ui/profile/viewModel/ProfileViewModel.dart b/lib/ui/profile/viewModel/ProfileViewModel.dart
new file mode 100644
index 0000000..dfa1c59
--- /dev/null
+++ b/lib/ui/profile/viewModel/ProfileViewModel.dart
@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+
+class ProfileViewModel extends ChangeNotifier {
+  final BuildContext context;
+
+  // Controllers e Key para o formulário
+  final GlobalKey<FormState> formKey = GlobalKey<FormState>();
+  final TextEditingController emailController = TextEditingController();
+
+  // Estado de carregamento
+  bool _isLoading = false;
+  bool get isLoading => _isLoading;
+
+  ProfileViewModel(this.context);
+
+  // Método para simular o envio do e-mail de recuperação de senha
+  Future<void> forgetPassword() async {
+    // Verifica se o formulário é válido
+    if (!formKey.currentState!.validate()) {
+      return;
+    }
+
+    _setLoading(true);
+
+    try {
+      // Simulação de chamada de API
+      await Future.delayed(const Duration(seconds: 2));
+
+      // Validações ou chamadas reais para a API iriam aqui
+      final email = emailController.text.trim();
+      if (email.isEmpty) {
+        throw Exception("O campo de e-mail não pode estar vazio.");
+      }
+
+      // Log fictício para simular sucesso
+      debugPrint("E-mail de recuperação enviado para: $email");
+    } catch (e) {
+      // Relança a exceção para que o consumidor exiba o erro
+      throw Exception("Erro ao enviar o e-mail: $e");
+    } finally {
+      _setLoading(false);
+    }
+  }
+
+  // Define o estado de carregamento e notifica os ouvintes
+  void _setLoading(bool value) {
+    _isLoading = value;
+    notifyListeners();
+  }
+
+  // Destruir controllers ao finalizar a ViewModel
+  @override
+  void dispose() {
+    emailController.dispose();
+    super.dispose();
+  }
+}
diff --git a/lib/ui/recover_account/model/RecoverAccountRequest.dart b/lib/ui/recover_account/model/RecoverAccountRequest.dart
new file mode 100644
index 0000000..240a184
--- /dev/null
+++ b/lib/ui/recover_account/model/RecoverAccountRequest.dart
@@ -0,0 +1,16 @@
+import 'dart:convert';
+
+class RecoverAccountRequest {
+
+  final String email;
+
+  RecoverAccountRequest(this.email);
+
+  factory RecoverAccountRequest.fromJsonString(String jsonString) {
+    Map<String, dynamic> json = jsonDecode(jsonString);
+    return RecoverAccountRequest(
+      json['email'] as String,
+    );
+  }
+
+}
diff --git a/lib/ui/recover_account/service/RecoverAccountService.dart b/lib/ui/recover_account/service/RecoverAccountService.dart
new file mode 100644
index 0000000..2ab2331
--- /dev/null
+++ b/lib/ui/recover_account/service/RecoverAccountService.dart
@@ -0,0 +1,17 @@
+import 'package:aranduapp/core/network/base_api.dart';
+import 'package:aranduapp/ui/recover_account/model/RecoverAccountRequest.dart';
+
+class RecoverAccountService {
+
+
+  static Future<void> forgetPassword(RecoverAccountRequest  recoverAccountRequest) async {
+
+    await BaseApi.getInstance(auth:false).post(
+      path: '/auth/forgot-password',
+      data: <String, dynamic> {
+        'email' : recoverAccountRequest.email,
+      }
+    );
+  }
+
+}
diff --git a/lib/ui/recover_account/view/RecoverAccount.dart b/lib/ui/recover_account/view/RecoverAccount.dart
deleted file mode 100644
index d157dc9..0000000
--- a/lib/ui/recover_account/view/RecoverAccount.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'package:flutter/material.dart';
-
-class RecoverAccount extends StatelessWidget{
-  const RecoverAccount({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    // TODO: implement build
-    throw UnimplementedError();
-  }
-
-}
diff --git a/lib/ui/recover_account/view/recover_account_view.dart b/lib/ui/recover_account/view/recover_account_view.dart
new file mode 100644
index 0000000..11199c0
--- /dev/null
+++ b/lib/ui/recover_account/view/recover_account_view.dart
@@ -0,0 +1,86 @@
+import 'package:aranduapp/core/log/Log.dart';
+import 'package:aranduapp/ui/recover_account/viewModel/recover_account_view_model.dart';
+import 'package:aranduapp/ui/shared/ErrorPopUp.dart';
+import 'package:aranduapp/ui/shared/TextAndLink.dart';
+import 'package:aranduapp/ui/shared/TextEmail.dart';
+import 'package:aranduapp/ui/shared/TitleSlogan.dart';
+import 'package:aranduapp/ui/shared/requestbutton.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class RecoverAccount extends StatelessWidget {
+  const RecoverAccount({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ChangeNotifierProvider(
+        create: (context) => RecoverAccountViewModel(),
+        builder: (context, child) {
+          return const RecoverAccountScreen();
+        });
+  }
+}
+
+class RecoverAccountScreen extends StatelessWidget {
+  const RecoverAccountScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    RecoverAccountViewModel viewModel =
+        Provider.of<RecoverAccountViewModel>(context);
+
+    return Scaffold(
+      body: SingleChildScrollView(
+        child: Center(
+          child: Column(
+            children: <Widget>[
+              const SizedBox(height: 80),
+              const TitleSlogan(),
+              const Padding(
+                padding: EdgeInsets.only(top: 70, left: 20, right: 20),
+                child: Text(
+                  'Coloque o seu e-mail no campo abaixo e clique em enviar. Logo em seguida, você receberá no seu e-mail as instruções para trocar a sua senha.',
+                ),
+              ),
+              Form(
+                  key: viewModel.formKey,
+                  child: Column(children: <Widget>[
+                    TextEmail(
+                        padding:
+                            const EdgeInsets.only(top: 24, left: 20, right: 20),
+                        controller: viewModel.emailController),
+                  ])),
+              Padding(
+                padding: const EdgeInsets.only(top: 80),
+                child: Requestbutton(
+                    command: viewModel.recoverCommand,
+                    onErrorCallback: (String e) {
+                      showDialog<Object>(
+                        context: context,
+                        builder: (BuildContext context) =>
+                            ErrorPopUp(content: Text(e)),
+                      );
+                    },
+                    onSuccessCallback: () {
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        const SnackBar(
+                            content: Text(
+                                'Estamos quase lá! Confira seu e-mail para redefinir sua senha.')),
+                      );
+                    },
+                    nameButton: 'Enviar'),
+              ),
+              TextAndLink(
+                text: 'Já tem uma conta?',
+                link: 'Faça login',
+                action: () {
+                  Navigator.of(context).pop();
+                },
+              )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/ui/recover_account/viewModel/recover_account_view_model.dart b/lib/ui/recover_account/viewModel/recover_account_view_model.dart
new file mode 100644
index 0000000..ae77d83
--- /dev/null
+++ b/lib/ui/recover_account/viewModel/recover_account_view_model.dart
@@ -0,0 +1,31 @@
+import 'package:aranduapp/core/log/Log.dart';
+import 'package:aranduapp/core/state/command.dart';
+import 'package:aranduapp/ui/recover_account/model/RecoverAccountRequest.dart';
+import 'package:aranduapp/ui/recover_account/service/RecoverAccountService.dart';
+import 'package:async/async.dart';
+import 'package:flutter/material.dart';
+
+class RecoverAccountViewModel extends ChangeNotifier {
+  GlobalKey<FormState> formKey;
+
+  TextEditingController emailController;
+
+  late Command0<void> recoverCommand;
+
+  RecoverAccountViewModel()
+      : formKey = GlobalKey<FormState>(),
+        emailController = TextEditingController() {
+    recoverCommand = Command0(_forgetPassword);
+  }
+
+  Future<Result<void>> _forgetPassword() async {
+    if (!formKey.currentState!.validate()) {
+      Result.error('Valores inválidos');
+    }
+
+    await RecoverAccountService.forgetPassword(
+        RecoverAccountRequest(emailController.text));
+
+    return Result.value(null);
+  }
+}
diff --git a/lib/ui/register_account/model/RegisterRequest.dart b/lib/ui/register_account/model/register_request.dart
similarity index 100%
rename from lib/ui/register_account/model/RegisterRequest.dart
rename to lib/ui/register_account/model/register_request.dart
diff --git a/lib/ui/register_account/model/RegisterResponse.dart b/lib/ui/register_account/model/register_response.dart
similarity index 100%
rename from lib/ui/register_account/model/RegisterResponse.dart
rename to lib/ui/register_account/model/register_response.dart
diff --git a/lib/ui/register_account/service/RegisterService.dart b/lib/ui/register_account/service/register_service.dart
similarity index 66%
rename from lib/ui/register_account/service/RegisterService.dart
rename to lib/ui/register_account/service/register_service.dart
index 090f0d1..98e4358 100644
--- a/lib/ui/register_account/service/RegisterService.dart
+++ b/lib/ui/register_account/service/register_service.dart
@@ -1,20 +1,14 @@
-import 'package:aranduapp/core/network/BaseApi.dart';
-import 'package:dio/dio.dart';
-import '../model/RegisterRequest.dart';
+import 'package:aranduapp/core/network/base_api.dart';
+import '../model/register_request.dart';
 
 class RegisterService {
-
   static Future<void> register(RegisterRequest registerRequest) async {
-
-    await BaseApi.getInstance()
+    await BaseApi.getInstance(auth: false)
         .post(path: '/users', data: <String, dynamic>{
       'name': registerRequest.name,
       'email': registerRequest.email,
       'username': registerRequest.userName,
       'password': registerRequest.password,
     });
-
   }
-
 }
-
diff --git a/lib/ui/register_account/view/RegisterAccount.dart b/lib/ui/register_account/view/register_account_view.dart
similarity index 65%
rename from lib/ui/register_account/view/RegisterAccount.dart
rename to lib/ui/register_account/view/register_account_view.dart
index 4e4e269..a5c9877 100644
--- a/lib/ui/register_account/view/RegisterAccount.dart
+++ b/lib/ui/register_account/view/register_account_view.dart
@@ -1,13 +1,14 @@
-import 'package:aranduapp/ui/login/view/LoginView.dart';
+import 'package:aranduapp/ui/login/view/login_view.dart';
 import 'package:aranduapp/ui/shared/OrDivider.dart';
 import 'package:aranduapp/ui/shared/TextAndLink.dart';
 import 'package:aranduapp/ui/shared/TextName.dart';
+import 'package:aranduapp/ui/shared/requestbutton.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:aranduapp/core/log/Log.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
-import 'package:aranduapp/ui/register_account/viewModel/RegisterViewModel.dart';
+import 'package:aranduapp/ui/register_account/viewModel/register_view_model.dart';
 
 import 'package:aranduapp/ui/shared/TitleSlogan.dart';
 import 'package:aranduapp/ui/shared/TextEmail.dart';
@@ -21,27 +22,20 @@ class RegisterAccount extends StatelessWidget {
   Widget build(BuildContext context) {
     return ChangeNotifierProvider(
       create: (context) => RegisterAccountViewModel(),
-      child: const _RegisterAccount(),
+      child: const RegisterAccountScreen(),
     );
   }
 }
 
-class _RegisterAccount extends StatefulWidget {
-  const _RegisterAccount({Key? key}) : super(key: key);
+class RegisterAccountScreen extends StatelessWidget {
+  const RegisterAccountScreen({super.key});
 
-  @override
-  State<StatefulWidget> createState() {
-    return _RegisterAccountState();
-  }
-}
-
-class _RegisterAccountState extends State<_RegisterAccount> {
   @override
   Widget build(BuildContext context) {
-    return Scaffold(body: _buildForm());
+    return Scaffold(body: _buildForm(context));
   }
 
-  Widget _buildForm() {
+  Widget _buildForm(BuildContext context) {
     return SingleChildScrollView(
       child: Column(
         mainAxisAlignment: MainAxisAlignment.start,
@@ -49,9 +43,9 @@ class _RegisterAccountState extends State<_RegisterAccount> {
           const SizedBox(height: 80),
           const TitleSlogan(),
           const SizedBox(height: 10),
-          _formSection(),
+          _formSection(context),
           const OrDivider(),
-          _buildGoogleLoginButton(),
+          _buildGoogleLoginButton(context),
           TextAndLink(
               text: 'Já tem uma conta?',
               link: 'faça login',
@@ -63,7 +57,7 @@ class _RegisterAccountState extends State<_RegisterAccount> {
     );
   }
 
-  Widget _formSection() {
+  Widget _formSection(BuildContext context) {
     RegisterAccountViewModel viewModel =
         Provider.of<RegisterAccountViewModel>(context);
 
@@ -71,10 +65,12 @@ class _RegisterAccountState extends State<_RegisterAccount> {
       key: viewModel.formKey,
       child: Column(children: [
         TextName(
+            key: const Key('nameField'),
             label: 'Nome',
             controller: viewModel.nameController,
             padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 20)),
         TextName(
+            key: const Key('userNameField'),
             label: 'Nome de Usuário',
             controller: viewModel.userNameController,
             padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 20)),
@@ -84,26 +80,23 @@ class _RegisterAccountState extends State<_RegisterAccount> {
         TextPassWord(
             padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 20),
             controller: viewModel.passwordController),
-        _buildTermsCheckbox(),
+        _buildTermsCheckbox(context),
         const SizedBox(height: 20),
-        _buildRegisterButton(),
+        _buildRegisterButton(context),
       ]),
     );
   }
 
-  Widget _buildTermsCheckbox() {
+  Widget _buildTermsCheckbox(BuildContext context) {
     final viewModel = Provider.of<RegisterAccountViewModel>(context);
+
     return Row(
       children: [
         Checkbox(
-          value: viewModel.isTermsAccepted,
-          onChanged: (value) {
-            // Ação ao clicar no checkbox
-            if (value != null) {
-              viewModel.toggleTermsAccepted(value);
-            }
-          },
-        ),
+            value: viewModel.isTermsAccepted,
+            onChanged: (value) {
+              viewModel.setToggleTermsAccepted(value ?? false);
+            }),
         Expanded(
           child: Text(
             'Aceite os termos de privacidade',
@@ -114,29 +107,29 @@ class _RegisterAccountState extends State<_RegisterAccount> {
     );
   }
 
-  Widget _buildRegisterButton() {
+  Widget _buildRegisterButton(BuildContext context) {
     final viewModel = Provider.of<RegisterAccountViewModel>(context);
-    return SizedBox(
-      width: 291,
-      height: 64,
-      child: ElevatedButton(
-          onPressed: () {
-            viewModel.register().catchError((e) => showDialog<Object>(
-                  context: context,
-                  builder: (BuildContext context) =>
-                      ErrorPopUp(content: Text('$e')),
-                ));
-            // Ação ao clicar no botão de cadastro
-          },
-          child: Consumer<RegisterAccountViewModel>(
-            builder: (context, value, child) => value.isLoading
-                ? const CircularProgressIndicator(value: null)
-                : const Text('Registrar'),
-          )),
-    );
+
+    return Requestbutton(
+        command: viewModel.registerCommand,
+        nameButton: 'Registrar',
+        onSuccessCallback: () {
+          ScaffoldMessenger.of(context).showSnackBar(
+            const SnackBar(content: Text('conta criada com sucesso!!!')),
+          );
+        },
+        onErrorCallback: (e) {
+          showDialog<Object>(
+            context: context,
+            builder: (BuildContext context) => ErrorPopUp(
+              content: Text(
+                  viewModel.registerCommand.result!.asError!.error.toString()),
+            ),
+          );
+        });
   }
 
-  Widget _buildGoogleLoginButton() {
+  Widget _buildGoogleLoginButton(BuildContext context) {
     return GestureDetector(
       onTap: () => Log.d(""),
       child: Container(
diff --git a/lib/ui/register_account/viewModel/RegisterViewModel.dart b/lib/ui/register_account/viewModel/RegisterViewModel.dart
deleted file mode 100644
index d91b31a..0000000
--- a/lib/ui/register_account/viewModel/RegisterViewModel.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-import 'package:flutter/material.dart';
-import '../model/RegisterRequest.dart';
-import '../service/RegisterService.dart';
-
-class RegisterAccountViewModel extends ChangeNotifier {
-
-  final GlobalKey<FormState> formKey = GlobalKey<FormState>();
-  final TextEditingController nameController = TextEditingController();
-  final TextEditingController emailController = TextEditingController();
-  final TextEditingController userNameController = TextEditingController();
-  final TextEditingController passwordController = TextEditingController();
-
-  final TextEditingController confPasswordController = TextEditingController();
-
-  bool isLoading = false;
-  bool isTermsAccepted = false; 
-
-  void toggleTermsAccepted(bool value) {
-    isTermsAccepted = value;
-    notifyListeners();
-  }
-
-  Future<void> register() async {
-    if (isLoading) return;
-    // Valida se os termos foram aceitos
-    if (!isTermsAccepted) {
-      throw Exception(
-          'Você deve aceitar os termos de privacidade e políticas de uso.');
-    }
-    try {
-      isLoading = true;
-      notifyListeners();
-      // Valida os campos do formulário
-      if (!formKey.currentState!.validate()) {
-        throw Exception('Por favor, preencha todos os campos corretamente');
-      }
-      // Criação do objeto de requisição
-      final request = RegisterRequest(
-        email: emailController.text,
-        name: nameController.text,
-        userName: userNameController.text,
-        password: passwordController.text,
-      );
-      // Chamada do serviço de registro
-      await RegisterService.register(request);
-    } finally {
-      isLoading = false;
-      notifyListeners();
-    }
-  }
-}
-
diff --git a/lib/ui/register_account/viewModel/register_view_model.dart b/lib/ui/register_account/viewModel/register_view_model.dart
new file mode 100644
index 0000000..9fdb1e8
--- /dev/null
+++ b/lib/ui/register_account/viewModel/register_view_model.dart
@@ -0,0 +1,47 @@
+import 'package:aranduapp/core/state/command.dart';
+import 'package:async/async.dart';
+import 'package:flutter/material.dart';
+import '../model/register_request.dart';
+import '../service/register_service.dart';
+
+class RegisterAccountViewModel extends ChangeNotifier {
+  final GlobalKey<FormState> formKey = GlobalKey<FormState>();
+  final TextEditingController nameController = TextEditingController();
+  final TextEditingController emailController = TextEditingController();
+  final TextEditingController userNameController = TextEditingController();
+  final TextEditingController passwordController = TextEditingController();
+
+  bool isTermsAccepted = false;
+
+  late Command0<void> registerCommand;
+
+  RegisterAccountViewModel() {
+    registerCommand = Command0<void>(_register);
+  }
+
+  Future<Result<void>> _register() async {
+
+    if (!isTermsAccepted) {
+      return Result.error(
+          'Você deve aceitar os termos de privacidade e políticas de uso.');
+    }
+
+    if (!formKey.currentState!.validate()) {
+      return Result.error('Por favor, preencha todos os campos corretamente');
+    }
+
+    await RegisterService.register(RegisterRequest(
+      email: emailController.text,
+      name: nameController.text,
+      userName: userNameController.text,
+      password: passwordController.text,
+    ));
+
+    return Result.value(null);
+  }
+
+  void setToggleTermsAccepted(bool value) {
+    isTermsAccepted = value;
+    notifyListeners();
+  }
+}
diff --git a/lib/ui/shared/ProfileHeader.dart b/lib/ui/shared/ProfileHeader.dart
new file mode 100644
index 0000000..c5067c1
--- /dev/null
+++ b/lib/ui/shared/ProfileHeader.dart
@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+
+class ProfileHeader extends StatelessWidget {
+  final String name;
+  final String role;
+
+  const ProfileHeader({
+    Key? key,
+    required this.name,
+    required this.role,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(16.0),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          // Imagem circular + texto
+          Row(
+            children: [
+              // Imagem circular
+              Container(
+                width: 80,
+                height: 80,
+                decoration: BoxDecoration(
+                  color:
+                      Theme.of(context).colorScheme.primary, // Cor cinza claro
+                  shape: BoxShape.circle,
+                ),
+              ),
+              const SizedBox(width: 16),
+              // Nome e descrição
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    name,
+                    style: TextStyle(
+                      fontSize: 20,
+                      fontWeight: FontWeight.bold,
+                      color: Theme.of(context).colorScheme.onSurface,
+                    ),
+                  ),
+                  const SizedBox(height: 4),
+                  Text(
+                    role,
+                    style: const TextStyle(
+                      fontSize: 16,
+                      color: Colors.grey,
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/ui/shared/TextEmail.dart b/lib/ui/shared/TextEmail.dart
index 385bbbc..27f533c 100644
--- a/lib/ui/shared/TextEmail.dart
+++ b/lib/ui/shared/TextEmail.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 
 class TextEmail extends StatelessWidget{
 
-
+  final String label;
   final TextEditingController controller;
   final EdgeInsetsGeometry padding;
 
@@ -11,8 +11,9 @@ class TextEmail extends StatelessWidget{
 
   const TextEmail ({
     super.key,
+    this.label = 'E-mail',
     required this.padding,
-    required this.controller
+    required this.controller,
   });
 
 
@@ -22,12 +23,18 @@ class TextEmail extends StatelessWidget{
     return Padding(
       padding: padding, 
       child: TextFormField(
-        validator: (value) => value == null|| emailRegex.hasMatch(value) ? null : 'E-mail inválido',
+        validator: (value) { 
+          if (value == null || value.trim().isEmpty) {
+            return '$label Obrigatório.';
+          } else if (!emailRegex.hasMatch(value.trim())) {
+            return 'Opa, $label inválido!\n(Ex: exemplo@gmail.com)';
+          }
+          return null;
+        },
         controller: controller,
         decoration: InputDecoration ( 
           prefixIcon: Icon ( Icons.email_outlined, color: Theme.of(context).colorScheme.primary),
-          labelText: 'E-mail'
-        ),
+          labelText: label),
       ),
     );
   }
diff --git a/lib/ui/shared/TextName.dart b/lib/ui/shared/TextName.dart
index e650f5f..620315b 100644
--- a/lib/ui/shared/TextName.dart
+++ b/lib/ui/shared/TextName.dart
@@ -17,8 +17,16 @@ class TextName extends StatelessWidget {
     return Padding(
       padding: padding,
       child: TextFormField(
-        validator: (value) =>
-            value == null || value.trim().length < 3 ? '$label inválido' : null,
+        validator: (value) {
+            if (value == null || value.trim().isEmpty) {
+              return '$label Obrigatório.';
+            } else if (value.trim().length < 2) {
+              return 'Opa, seu $label está pequeno!\nacrescente mais caracteres. (Ex: Ana)';
+            } else if (value.trim().length < 3) {
+              return 'Opa, seu $label está pequeno!\nacrescente mais um caractere. (Ex: Ana)';
+            }
+            return null;
+        },
         controller: controller,
         decoration: InputDecoration(
             prefixIcon: Icon(Icons.person_outline,
diff --git a/lib/ui/shared/TextPassword.dart b/lib/ui/shared/TextPassword.dart
index a0d2f63..06379b4 100644
--- a/lib/ui/shared/TextPassword.dart
+++ b/lib/ui/shared/TextPassword.dart
@@ -1,56 +1,56 @@
 import 'package:flutter/material.dart';
 
 class TextPassWord extends StatefulWidget {
-
+  final String label;
   final TextEditingController controller;
   final EdgeInsetsGeometry padding;
 
-  const TextPassWord ({
-    super.key,
-    required this.padding,
-    required this.controller
+  const TextPassWord({
+    super.key, 
+    this.label = 'Senha',
+    required this.padding, 
+    required this.controller,
   });
 
-
   @override
   State<StatefulWidget> createState() {
     return _TextPassWord();
-  } 
+  }
 }
 
-
 class _TextPassWord extends State<TextPassWord> {
   bool _hidePassord = true;
 
   @override
   Widget build(BuildContext context) {
-    
-    return 
-      Padding(
-        padding: widget.padding, 
-        child: TextFormField(
+    return Padding(
+      padding: widget.padding,
+      child: TextFormField(
         validator: (value) {
-          if (value == null || value.isEmpty || value.length < 8) {
-            return 'Senha inválida';
+          if (value == null || value.isEmpty) {
+            return '${widget.label} Obrigatória.';
+          } else if (value.length < 8) {
+            return '${widget.label} deve ter no mínimo 8 caracteres.\n(Ex: @abd1234)';
           }
           return null;
         },
         controller: widget.controller,
-            obscureText: _hidePassord,
-            decoration: InputDecoration ( 
-              prefixIcon: Icon ( Icons.lock_outline, color: Theme.of(context).colorScheme.primary),
-              suffixIcon: GestureDetector ( 
-                onTap: () => setState(() { _hidePassord = !_hidePassord; }),
-                child: Icon( 
-                  _hidePassord ? Icons.visibility_off_outlined : Icons.visibility_outlined,
-                  color: Theme.of(context).colorScheme.primary
-                )
-              ),
-              labelText: 'Senha'
-            ),
+        obscureText: _hidePassord,
+        decoration: InputDecoration(
+            prefixIcon: Icon(Icons.lock_outline,
+                color: Theme.of(context).colorScheme.primary),
+            suffixIcon: GestureDetector(
+                onTap: () => setState(() {
+                      _hidePassord = !_hidePassord;
+                    }),
+                child: Icon(
+                    _hidePassord
+                        ? Icons.visibility_off_outlined
+                        : Icons.visibility_outlined,
+                    color: Theme.of(context).colorScheme.primary)),
+            labelText: widget.label,
         ),
-      );
-
-
-  } 
+      ),
+    );
+  }
 }
diff --git a/lib/ui/shared/requestbutton.dart b/lib/ui/shared/requestbutton.dart
new file mode 100644
index 0000000..b163008
--- /dev/null
+++ b/lib/ui/shared/requestbutton.dart
@@ -0,0 +1,51 @@
+import 'package:aranduapp/core/state/command.dart';
+import 'package:flutter/material.dart';
+
+class Requestbutton extends StatelessWidget {
+  final Command0 command;
+  final String nameButton;
+
+  final VoidCallback onSuccessCallback;
+  final ValueChanged<String> onErrorCallback;
+
+  const Requestbutton({
+    super.key,
+    required this.command,
+    required this.nameButton,
+    required this.onSuccessCallback,
+    required this.onErrorCallback,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListenableBuilder(
+      listenable: command,
+      builder: (context, child) {
+        if (command.isError) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            onErrorCallback(command.result!.asError!.error.toString());
+          });
+        }
+
+        if (command.isOk) {
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            onSuccessCallback();
+          });
+        }
+
+        return SizedBox(
+          width: 291,
+          height: 64,
+          child: ElevatedButton(
+            onPressed: () async {
+              command.execute();
+            },
+            child: command.running
+                ? const CircularProgressIndicator(value: null)
+                : Text(nameButton),
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/ui/welcome/view/WelcomeView.dart b/lib/ui/welcome/view/WelcomeView.dart
index 033bde9..af76569 100644
--- a/lib/ui/welcome/view/WelcomeView.dart
+++ b/lib/ui/welcome/view/WelcomeView.dart
@@ -1,92 +1,106 @@
-import 'package:aranduapp/core/log/Log.dart';
 import 'package:aranduapp/ui/onboarding/view/onboarding_view.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:google_fonts/google_fonts.dart';
 
-
-class WelcomeView extends StatelessWidget {
-  //final WelcomeModel model = WelcomeModel("Arandú","Começar");
+class WelcomeView extends StatefulWidget {
 
   WelcomeView({super.key});
 
+  @override
+  State<WelcomeView> createState() => _WelcomeViewState();
+}
+
+class _WelcomeViewState extends State<WelcomeView> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            const SizedBox(height: 95),
-
-            //Cículo com gradiente com possível logo sobreposta
-            Stack(
-              alignment: Alignment.center, 
-              children: [
-
-
-
-                Container(
-                  width: 278,
-                  height: 278,
-                  decoration: BoxDecoration(
-                    color: Theme.of(context).colorScheme.primary,
-                    shape: BoxShape.circle,
-                  ),
-                ),
-
-              ],
-            ),
-            const SizedBox(height: 20),
+        body: Center(
+            child: SingleChildScrollView(
+                child: Column(
+      mainAxisAlignment: MainAxisAlignment.start,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        _logo(context),
+        const SizedBox(height: 80),
+        _startButton(context),
+        const SizedBox(width: 80),
+      ],
+    ))));
+  }
 
-            //Titulo "arandú" com fonte amarante 
-            Text(
-              "Arandú",
-              style: GoogleFonts.amarante(
-                fontSize: 60,
-                fontWeight: FontWeight.w500, 
+  Widget _logo(BuildContext context) {
+    Size screenSize = MediaQuery.of(context).size;
+
+    double circleDiameter = screenSize.height;
+    double nameSize = screenSize.height * 0.075;
+
+    return Center(
+        child: SingleChildScrollView(
+            child: Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        //Cículo com gradiente com possível logo sobreposta
+        Stack(
+          alignment: Alignment.center,
+          children: [
+            Container(
+              width: circleDiameter * 0.3,
+              height: circleDiameter *0.3,
+              decoration: BoxDecoration(
+                color: Theme.of(context).colorScheme.primary,
+                shape: BoxShape.circle,
               ),
             ),
-            const Spacer(),
-
-            //Botão de começar com gradiente
-            GestureDetector(
-              onTap: () => {
-
-
-              Navigator.of(context).push(
-                MaterialPageRoute(
-                  builder: (context) => const OnboardingView(),
-                ),
-              )
-
-
-              },
+          ],
+        ),
 
+        const SizedBox(height: 25),
 
-              child: Container(
-                padding: const EdgeInsets.symmetric(horizontal:120, vertical: 15),
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(15),
-                  color: Theme.of(context).colorScheme.primary,
-                ),
-                child: Text(
-                  "Começar",
-                  style: GoogleFonts.comfortaa(
-                    color: Colors.white,
-                    fontSize: 15,
-                    fontWeight: FontWeight.w500, //coloca a fonte certa
+        //Titulo "arandú" com fonte amarante
+        Text(
+          "Arandú",
+          style: GoogleFonts.amarante(
+            textStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
+              fontSize: nameSize,
+              fontWeight: FontWeight.w500,
+            ),
+          ),
+        ),
+      ],
+    )));
+  }
 
-                  ),
-                )
-              ),
-          
+  Widget _startButton(BuildContext context) {
+    Size screenSize = MediaQuery.of(context).size;
+
+    double paddingHorizontal =
+        screenSize.width * 0.07; // largura da tela
+    double paddingVertical = screenSize.height * 0.025; // da altura da tela
+    return SingleChildScrollView(
+      child: GestureDetector(
+        onTap: () => {
+          Navigator.of(context).pushReplacement(
+            MaterialPageRoute(
+              builder: (context) => const OnboardingView(),
             ),
-            const SizedBox(height:50),          
-          ],
-        )
-      )
+          )
+        },
+        child: Container(
+            padding: EdgeInsets.symmetric(
+                horizontal: paddingHorizontal, vertical: paddingVertical),
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(15),
+              color: Theme.of(context).colorScheme.primary,
+            ),
+            child: Text(
+              "Começar",
+              style: Theme.of(context).textTheme.bodyLarge?.apply(
+                color: Theme.of(context).colorScheme.onPrimary,
+              ),
+            )),
+      ),
     );
   }
-  
 }
diff --git a/pubspec.lock b/pubspec.lock
index a7ff271..cd7aa9a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,8 +1,37 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  async:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      url: "https://pub.dev"
+    source: hosted
+    version: "72.0.0"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.3.2"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.7.0"
+  args:
     dependency: transitive
+    description:
+      name: args
+      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.0"
+  async:
+    dependency: "direct main"
     description:
       name: async
       sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
@@ -17,6 +46,70 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
+  build_resolvers:
+    dependency: transitive
+    description:
+      name: build_resolvers
+      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  build_runner:
+    dependency: "direct main"
+    description:
+      name: build_runner
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.13"
+  build_runner_core:
+    dependency: transitive
+    description:
+      name: build_runner_core
+      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.3.2"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.1"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.9.3"
   characters:
     dependency: transitive
     description:
@@ -25,6 +118,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
   clock:
     dependency: transitive
     description:
@@ -33,6 +134,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.10.1"
   collection:
     dependency: transitive
     description:
@@ -41,6 +150,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.18.0"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
   crypto:
     dependency: transitive
     description:
@@ -57,6 +174,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.8"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.7"
   dio:
     dependency: "direct main"
     description:
@@ -89,6 +214,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.3"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.1"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
   flex_color_scheme:
     dependency: "direct main"
     description:
@@ -192,6 +333,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "10.8.0"
+  frontend_server_client:
+    dependency: transitive
+    description:
+      name: frontend_server_client
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
   google_fonts:
     dependency: "direct main"
     description:
@@ -200,6 +357,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.2.1"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
   http:
     dependency: transitive
     description:
@@ -208,6 +373,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.2"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.2"
   http_parser:
     dependency: transitive
     description:
@@ -224,6 +397,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.19.0"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
   js:
     dependency: transitive
     description:
@@ -232,6 +413,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.7"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
@@ -312,6 +501,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.5.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2-main.4"
   matcher:
     dependency: transitive
     description:
@@ -336,6 +541,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.15.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  mockito:
+    dependency: "direct main"
+    description:
+      name: mockito
+      sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.4.4"
   nested:
     dependency: transitive
     description:
@@ -344,6 +565,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
   path:
     dependency: transitive
     description:
@@ -416,6 +645,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.1"
   provider:
     dependency: "direct main"
     description:
@@ -424,11 +661,51 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.2"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.5"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.99"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.0"
   source_span:
     dependency: transitive
     description:
@@ -453,6 +730,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -477,6 +762,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.2"
+  timing:
+    dependency: transitive
+    description:
+      name: timing
+      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   typed_data:
     dependency: transitive
     description:
@@ -501,6 +794,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "14.2.5"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
   web:
     dependency: transitive
     description:
@@ -509,6 +810,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   win32:
     dependency: transitive
     description:
@@ -525,6 +842,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
 sdks:
   dart: ">=3.5.3 <4.0.0"
   flutter: ">=3.24.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 1593fb4..94dd8b2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -44,6 +44,10 @@ dependencies:
   dio: ^5.7.0
   font_awesome_flutter: ^10.8.0
   flutter_secure_storage: ^9.2.2
+  mockito: ^5.4.4
+  build_runner: ^2.4.13
+  async: ^2.11.0
+
 
 dev_dependencies:
   flutter_test:
@@ -72,6 +76,10 @@ flutter:
     - assets/images/Component2.png
     - assets/images/Component3.png
 
+
+
+    
+
   # To add assets to your application, add an assets section, like this:
   # assets:
   #   - images/a_dot_burr.jpeg
diff --git a/test/ui/Shared/ErrorPopUp_test.dart b/test/ui/Shared/ErrorPopUp_test.dart
new file mode 100644
index 0000000..3bee757
--- /dev/null
+++ b/test/ui/Shared/ErrorPopUp_test.dart
@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:aranduapp/ui/shared/ErrorPopUp.dart';
+
+void main() {
+  testWidgets('Testa ErrorPopUp', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      const MaterialApp(
+        home: Scaffold(
+          body: ErrorPopUp(
+            content: Text('Este é um erro'),
+          ),
+        ),
+      ),
+    );
+
+    // Verificar se o ícone de erro está presente
+    expect(find.byIcon(Icons.error), findsOneWidget);
+
+    // Verificar se o conteúdo do popup está correto
+    expect(find.text('Este é um erro'), findsOneWidget);
+
+    // Verificar se o botão 'OK' está presente
+    expect(find.text('OK'), findsOneWidget);
+
+    // Tocar no botão OK
+    await tester.tap(find.text('OK'));
+
+    // Rebuild após o tap para processar a navegação
+    await tester.pumpAndSettle();
+
+    expect(find.text('OK'), findsNothing);
+    expect(find.byIcon(Icons.error), findsNothing);
+    expect(find.text('Este é um erro'), findsNothing); // O popup desapareceu
+  });
+}
diff --git a/test/ui/Shared/TextEmail_test.dart b/test/ui/Shared/TextEmail_test.dart
new file mode 100644
index 0000000..fb07c2e
--- /dev/null
+++ b/test/ui/Shared/TextEmail_test.dart
@@ -0,0 +1,37 @@
+import 'package:aranduapp/ui/shared/TextEmail.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  testWidgets('Testa se Email é válido ou inválido',
+      (WidgetTester tester) async {
+    final controller = TextEditingController();
+
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: TextEmail(
+              padding: const EdgeInsets.all(10), controller: controller),
+        ),
+      ),
+    );
+
+    final emailField = find.byType(TextFormField);
+
+    // Função auxiliar para validar diferentes entradas de e-mail
+    Future<void> testEmail(String input, String? expectedError) async {
+      await tester.enterText(emailField, input);
+      await tester.pump();
+      final validator =
+          tester.widget<TextFormField>(emailField).validator!(input);
+      expect(validator, expectedError);
+    }
+
+    // Teste de validação para diferentes casos
+    await testEmail("", "E-mail Obrigatório."); // Campo vazio
+    await testEmail("joaozinhi", "Opa, E-mail inválido!\n(Ex: exemplo@gmail.com)"); // Sem '@'
+    await testEmail("joaozinhi@", "Opa, E-mail inválido!\n(Ex: exemplo@gmail.com)"); // Sem domínio
+    await testEmail("joao@domain", "Opa, E-mail inválido!\n(Ex: exemplo@gmail.com)"); // Sem extensão
+    await testEmail("joao@example.com", null); // Entrada válida
+  });
+}
diff --git a/test/ui/Shared/TextName_test.dart b/test/ui/Shared/TextName_test.dart
new file mode 100644
index 0000000..b18e1ae
--- /dev/null
+++ b/test/ui/Shared/TextName_test.dart
@@ -0,0 +1,35 @@
+import 'package:aranduapp/ui/shared/TextName.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  testWidgets('Testa se o nome é válido', (WidgetTester tester) async {
+    final controller = TextEditingController();
+
+    await tester.pumpWidget(MaterialApp(
+        home: Scaffold(
+      body: TextName(
+        controller: controller,
+        padding: const EdgeInsets.all(10),
+      ),
+    )));
+
+    final nameField = find.byType(TextFormField);
+
+    // Função auxiliar para validar diferentes entradas de nome
+    Future<void> testName(String input, String? expectedError) async {
+      await tester.enterText(nameField, input);
+      await tester.pump();
+      final validator =
+          tester.widget<TextFormField>(nameField).validator!(input);
+      expect(validator, expectedError);
+    }
+
+    // Teste de validação para diferentes casos de nome
+    await testName("", 'Nome Obrigatório.'); // Campo vazio
+    await testName("  a", 'Opa, seu Nome está pequeno!\nacrescente mais caracteres. (Ex: Ana)'); // Nome com menos de 3 caracteres
+    await testName("Jo", 'Opa, seu Nome está pequeno!\nacrescente mais um caractere. (Ex: Ana)'); // Nome com 2 caracteres
+    await testName("João", null); // Nome válido
+    await testName("Maria", null); // Outro nome válido
+  });
+}
diff --git a/test/ui/Shared/TextPassword_test.dart b/test/ui/Shared/TextPassword_test.dart
new file mode 100644
index 0000000..95172d9
--- /dev/null
+++ b/test/ui/Shared/TextPassword_test.dart
@@ -0,0 +1,90 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:aranduapp/ui/shared/TextPassword.dart';
+
+void main() {
+  // Testa a validação da senha no widget TextPassWord
+  testWidgets('Testa se a senha é válida', (WidgetTester tester) async {
+    final controller = TextEditingController();
+
+    // Monta o widget de teste com TextPassWord
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: TextPassWord(
+            controller: controller,
+            padding: const EdgeInsets.all(10),
+          ),
+        ),
+      ),
+    );
+
+    // Localiza o campo de texto do formulário
+    final passwordField = find.byType(TextFormField);
+
+    // Função para testar diferentes cenários de validação de senha
+    Future<void> testPassword(String input, String? expectedError) async {
+      await tester.enterText(passwordField, input); // Insere texto no campo
+      await tester.pump(); // Re-renderiza o widget para capturar mudanças
+      final validator =
+          tester.widget<TextFormField>(passwordField).validator!(input);
+      expect(validator,
+          expectedError); // Verifica se o erro retornado é o esperado
+    }
+
+    // Testa senhas inválidas, válidas e campo vazio
+    await testPassword('12345', "Senha deve ter no mínimo 8 caracteres.\n(Ex: @abd1234)"); // Senha muito curta
+    await testPassword('validPassword123', null); // Senha válida
+    await testPassword('', 'Senha Obrigatória.'); // Campo vazio
+  });
+
+  // Testa a funcionalidade de visibilidade da senha
+  testWidgets('Testa a visibilidade da senha', (WidgetTester tester) async {
+    final controller = TextEditingController();
+
+    // Monta o widget de teste com TextPassWord
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: TextPassWord(
+            controller: controller,
+            padding: const EdgeInsets.all(10),
+          ),
+        ),
+      ),
+    );
+
+    // Localiza o ícone de visibilidade e o campo de texto
+    final visibilityIcon = find.byIcon(Icons.visibility_off_outlined);
+    final textFieldFinder = find.byType(TextField);
+
+    // Verifica se o ícone inicial de visibilidade está presente
+    expect(visibilityIcon, findsOneWidget);
+
+    // Verifica o estado inicial de obscureText (deve ser verdadeiro)
+    TextField textField = tester.widget<TextField>(textFieldFinder);
+    expect(textField.obscureText, true);
+
+    // Simula o clique no ícone para alterar a visibilidade da senha
+    await tester.tap(visibilityIcon);
+    await tester.pump();
+
+    // Verifica se o ícone foi alterado para o estado visível
+    expect(find.byIcon(Icons.visibility_outlined), findsOneWidget);
+
+    // Verifica se obscureText agora é falso
+    textField = tester.widget<TextField>(textFieldFinder);
+    expect(textField.obscureText, false);
+
+    // Simula outro clique para voltar a ocultar a senha
+    await tester.tap(find.byIcon(Icons.visibility_outlined));
+    await tester.pump();
+
+    // Verifica se o ícone voltou para o estado inicial
+    expect(find.byIcon(Icons.visibility_off_outlined), findsOneWidget);
+
+    // Verifica novamente se obscureText é verdadeiro
+    textField = tester.widget<TextField>(textFieldFinder);
+    expect(textField.obscureText, true);
+  });
+}
diff --git a/lib/ui/profile/view/Profile.dart b/test/ui/Shared/requestbutton.dart
similarity index 100%
rename from lib/ui/profile/view/Profile.dart
rename to test/ui/Shared/requestbutton.dart
diff --git a/test/ui/login/view/login_view_test.dart b/test/ui/login/view/login_view_test.dart
new file mode 100644
index 0000000..cf2186a
--- /dev/null
+++ b/test/ui/login/view/login_view_test.dart
@@ -0,0 +1,130 @@
+import 'package:aranduapp/core/state/command.dart';
+import 'package:aranduapp/ui/login/view/login_view.dart';
+import 'package:aranduapp/ui/login/viewModel/login_view_model.dart';
+import 'package:aranduapp/ui/navbar/view/navBarView.dart';
+import 'package:aranduapp/ui/shared/TextEmail.dart';
+import 'package:aranduapp/ui/shared/TextPassword.dart';
+import 'package:async/async.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+
+@GenerateNiceMocks([MockSpec<LoginViewModel>(), MockSpec<Command0>()])
+import 'login_view_test.mocks.dart';
+
+void main() {
+  late MockLoginViewModel mockViewModel;
+  late MockCommand0 mockLoginCommand;
+  late MockCommand0 mockValidadeTokenCommand;
+
+  setUp(() {
+    mockViewModel = MockLoginViewModel();
+    when(mockViewModel.formKey).thenReturn(GlobalKey<FormState>());
+    when(mockViewModel.emailController).thenReturn(TextEditingController());
+    when(mockViewModel.passwordController).thenReturn(TextEditingController());
+
+    mockLoginCommand = MockCommand0();
+    when(mockLoginCommand.execute())
+        .thenAnswer((_) async => Result.value(null));
+    when(mockViewModel.loginCommand).thenReturn(mockLoginCommand);
+
+    mockValidadeTokenCommand = MockCommand0();
+    when(mockViewModel.validadeTokenCommand)
+        .thenReturn(mockValidadeTokenCommand);
+    when(mockValidadeTokenCommand.execute())
+        .thenAnswer((_) async => Result.value(null));
+    when(mockValidadeTokenCommand.running).thenReturn(false);
+    when(mockValidadeTokenCommand.isError).thenReturn(false);
+    when(mockValidadeTokenCommand.isOk).thenReturn(false);
+  });
+
+  Widget createLoginScreen() {
+    return ChangeNotifierProvider<LoginViewModel>.value(
+      value: mockViewModel,
+      child: const MaterialApp(
+        home: LoginScreen(),
+      ),
+    );
+  }
+
+  testWidgets('Displays loading screen while waiting for validade token',
+      (WidgetTester tester) async {
+    when(mockValidadeTokenCommand.running).thenReturn(true);
+
+    await tester.pumpWidget(createLoginScreen());
+
+    expect(find.byType(CircularProgressIndicator), findsOneWidget);
+  });
+
+  testWidgets('login with auth device', (WidgetTester tester) async {
+    when(mockValidadeTokenCommand.isOk).thenReturn(true);
+
+    await tester.pumpWidget(createLoginScreen());
+    await tester.pumpAndSettle();
+
+    when(mockViewModel.loginWithDeviceAuth()).thenAnswer((_) async => true);
+    final button = find.text('Usar senha do celular');
+    expect(button, findsOneWidget);
+    await tester.tap(button);
+
+    await tester.pumpAndSettle();
+
+    expect(find.byType(NavbarView), findsOneWidget);
+
+    verify(mockViewModel.loginWithDeviceAuth()).called(2);
+  });
+
+  testWidgets(
+      'Login screen displays email and password fields and login button',
+      (WidgetTester tester) async {
+    when(mockValidadeTokenCommand.isError).thenReturn(true);
+
+    await tester.pumpWidget(createLoginScreen());
+    await tester.pumpAndSettle();
+
+    expect(find.byType(TextEmail), findsOneWidget);
+    expect(find.byType(TextPassWord), findsOneWidget);
+    expect(find.text('Entrar'), findsOneWidget);
+  });
+
+  testWidgets('Test User Input for Email and Password',
+      (WidgetTester tester) async {
+    when(mockValidadeTokenCommand.isError).thenReturn(true);
+
+    await tester.pumpWidget(createLoginScreen());
+    await tester.pumpAndSettle();
+
+    const email = 'test@example.com';
+    const password = 'password123';
+
+    await tester.enterText(find.byType(TextEmail), email);
+    await tester.enterText(find.byType(TextPassWord), password);
+
+    expect(mockViewModel.emailController.text, email);
+    expect(mockViewModel.passwordController.text, password);
+  });
+
+  testWidgets('Login is successful', (WidgetTester tester) async {
+    when(mockValidadeTokenCommand.isError).thenReturn(true);
+
+    await tester.pumpWidget(createLoginScreen());
+    await tester.pumpAndSettle();
+
+    when(mockLoginCommand.execute())
+        .thenAnswer((_) async => Result.value(null));
+
+    await tester.tap(find.text('Entrar'));
+
+    await tester.pumpAndSettle();
+
+    verify(mockLoginCommand.execute()).called(1);
+
+    //TODO: verify navigation to navbar
+  });
+
+  testWidgets('Displays error when login fails', (WidgetTester tester) async {
+    //TODO: 
+  });
+}
diff --git a/test/ui/login/view/login_view_test.mocks.dart b/test/ui/login/view/login_view_test.mocks.dart
new file mode 100644
index 0000000..21468ae
--- /dev/null
+++ b/test/ui/login/view/login_view_test.mocks.dart
@@ -0,0 +1,362 @@
+// Mocks generated by Mockito 5.4.4 from annotations
+// in aranduapp/test/ui/login/view/login_view_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i6;
+
+import 'package:aranduapp/core/state/command.dart' as _i2;
+import 'package:aranduapp/ui/login/viewModel/login_view_model.dart' as _i5;
+import 'package:async/async.dart' as _i4;
+import 'package:flutter/material.dart' as _i3;
+import 'package:mockito/mockito.dart' as _i1;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeCommand0_0<T> extends _i1.SmartFake implements _i2.Command0<T> {
+  _FakeCommand0_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeGlobalKey_1<T extends _i3.State<_i3.StatefulWidget>>
+    extends _i1.SmartFake implements _i3.GlobalKey<T> {
+  _FakeGlobalKey_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeTextEditingController_2 extends _i1.SmartFake
+    implements _i3.TextEditingController {
+  _FakeTextEditingController_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeResult_3<T> extends _i1.SmartFake implements _i4.Result<T> {
+  _FakeResult_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [LoginViewModel].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockLoginViewModel extends _i1.Mock implements _i5.LoginViewModel {
+  @override
+  _i2.Command0<void> get loginCommand => (super.noSuchMethod(
+        Invocation.getter(#loginCommand),
+        returnValue: _FakeCommand0_0<void>(
+          this,
+          Invocation.getter(#loginCommand),
+        ),
+        returnValueForMissingStub: _FakeCommand0_0<void>(
+          this,
+          Invocation.getter(#loginCommand),
+        ),
+      ) as _i2.Command0<void>);
+
+  @override
+  set loginCommand(_i2.Command0<void>? _loginCommand) => super.noSuchMethod(
+        Invocation.setter(
+          #loginCommand,
+          _loginCommand,
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  _i2.Command0<void> get validadeTokenCommand => (super.noSuchMethod(
+        Invocation.getter(#validadeTokenCommand),
+        returnValue: _FakeCommand0_0<void>(
+          this,
+          Invocation.getter(#validadeTokenCommand),
+        ),
+        returnValueForMissingStub: _FakeCommand0_0<void>(
+          this,
+          Invocation.getter(#validadeTokenCommand),
+        ),
+      ) as _i2.Command0<void>);
+
+  @override
+  set validadeTokenCommand(_i2.Command0<void>? _validadeTokenCommand) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #validadeTokenCommand,
+          _validadeTokenCommand,
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  _i3.GlobalKey<_i3.FormState> get formKey => (super.noSuchMethod(
+        Invocation.getter(#formKey),
+        returnValue: _FakeGlobalKey_1<_i3.FormState>(
+          this,
+          Invocation.getter(#formKey),
+        ),
+        returnValueForMissingStub: _FakeGlobalKey_1<_i3.FormState>(
+          this,
+          Invocation.getter(#formKey),
+        ),
+      ) as _i3.GlobalKey<_i3.FormState>);
+
+  @override
+  _i3.TextEditingController get emailController => (super.noSuchMethod(
+        Invocation.getter(#emailController),
+        returnValue: _FakeTextEditingController_2(
+          this,
+          Invocation.getter(#emailController),
+        ),
+        returnValueForMissingStub: _FakeTextEditingController_2(
+          this,
+          Invocation.getter(#emailController),
+        ),
+      ) as _i3.TextEditingController);
+
+  @override
+  _i3.TextEditingController get passwordController => (super.noSuchMethod(
+        Invocation.getter(#passwordController),
+        returnValue: _FakeTextEditingController_2(
+          this,
+          Invocation.getter(#passwordController),
+        ),
+        returnValueForMissingStub: _FakeTextEditingController_2(
+          this,
+          Invocation.getter(#passwordController),
+        ),
+      ) as _i3.TextEditingController);
+
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  _i6.Future<_i4.Result<void>> loginWithEmailAndPassword() =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #loginWithEmailAndPassword,
+          [],
+        ),
+        returnValue: _i6.Future<_i4.Result<void>>.value(_FakeResult_3<void>(
+          this,
+          Invocation.method(
+            #loginWithEmailAndPassword,
+            [],
+          ),
+        )),
+        returnValueForMissingStub:
+            _i6.Future<_i4.Result<void>>.value(_FakeResult_3<void>(
+          this,
+          Invocation.method(
+            #loginWithEmailAndPassword,
+            [],
+          ),
+        )),
+      ) as _i6.Future<_i4.Result<void>>);
+
+  @override
+  _i6.Future<_i4.Result<void>> validateToken() => (super.noSuchMethod(
+        Invocation.method(
+          #validateToken,
+          [],
+        ),
+        returnValue: _i6.Future<_i4.Result<void>>.value(_FakeResult_3<void>(
+          this,
+          Invocation.method(
+            #validateToken,
+            [],
+          ),
+        )),
+        returnValueForMissingStub:
+            _i6.Future<_i4.Result<void>>.value(_FakeResult_3<void>(
+          this,
+          Invocation.method(
+            #validateToken,
+            [],
+          ),
+        )),
+      ) as _i6.Future<_i4.Result<void>>);
+
+  @override
+  _i6.Future<bool> loginWithDeviceAuth() => (super.noSuchMethod(
+        Invocation.method(
+          #loginWithDeviceAuth,
+          [],
+        ),
+        returnValue: _i6.Future<bool>.value(false),
+        returnValueForMissingStub: _i6.Future<bool>.value(false),
+      ) as _i6.Future<bool>);
+
+  @override
+  void addListener(dynamic listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void removeListener(dynamic listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
+
+/// A class which mocks [Command0].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCommand0<T> extends _i1.Mock implements _i2.Command0<T> {
+  @override
+  _i6.Future<_i4.Result<T>> Function() get action => (super.noSuchMethod(
+        Invocation.getter(#action),
+        returnValue: () => _i6.Future<_i4.Result<T>>.value(_FakeResult_3<T>(
+          this,
+          Invocation.getter(#action),
+        )),
+        returnValueForMissingStub: () =>
+            _i6.Future<_i4.Result<T>>.value(_FakeResult_3<T>(
+          this,
+          Invocation.getter(#action),
+        )),
+      ) as _i6.Future<_i4.Result<T>> Function());
+
+  @override
+  bool get isError => (super.noSuchMethod(
+        Invocation.getter(#isError),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  bool get isOk => (super.noSuchMethod(
+        Invocation.getter(#isOk),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  bool get running => (super.noSuchMethod(
+        Invocation.getter(#running),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  _i6.Future<_i4.Result<T>> execute() => (super.noSuchMethod(
+        Invocation.method(
+          #execute,
+          [],
+        ),
+        returnValue: _i6.Future<_i4.Result<T>>.value(_FakeResult_3<T>(
+          this,
+          Invocation.method(
+            #execute,
+            [],
+          ),
+        )),
+        returnValueForMissingStub:
+            _i6.Future<_i4.Result<T>>.value(_FakeResult_3<T>(
+          this,
+          Invocation.method(
+            #execute,
+            [],
+          ),
+        )),
+      ) as _i6.Future<_i4.Result<T>>);
+
+  @override
+  void addListener(dynamic listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void removeListener(dynamic listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
diff --git a/test/ui/recover_account/view/recover_account_test.dart b/test/ui/recover_account/view/recover_account_test.dart
new file mode 100644
index 0000000..599ded6
--- /dev/null
+++ b/test/ui/recover_account/view/recover_account_test.dart
@@ -0,0 +1,86 @@
+import 'package:aranduapp/core/state/command.dart';
+import 'package:aranduapp/ui/shared/TextAndLink.dart';
+import 'package:aranduapp/ui/shared/TextEmail.dart';
+import 'package:aranduapp/ui/shared/TitleSlogan.dart';
+import 'package:aranduapp/ui/shared/requestbutton.dart';
+import 'package:async/async.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+import 'package:aranduapp/ui/recover_account/view/recover_account_view.dart';
+import 'package:aranduapp/ui/recover_account/viewModel/recover_account_view_model.dart';
+
+@GenerateNiceMocks([MockSpec<RecoverAccountViewModel>(), MockSpec<Command0>()])
+import 'recover_account_test.mocks.dart';
+
+void main() {
+  late MockRecoverAccountViewModel mockViewModel;
+  late Command0 mockCommand0;
+
+  setUp(() {
+    mockViewModel = MockRecoverAccountViewModel();
+    mockCommand0 = MockCommand0();
+
+    when(mockCommand0.execute()).thenAnswer((_) async => Result.value(null));
+    when(mockViewModel.recoverCommand).thenReturn(mockCommand0);
+
+    when(mockViewModel.formKey).thenReturn(GlobalKey<FormState>());
+    when(mockViewModel.emailController).thenReturn(TextEditingController());
+
+  });
+
+  Widget createLoginScreen(MockRecoverAccountViewModel mockViewModel) {
+    return ChangeNotifierProvider<RecoverAccountViewModel>.value(
+      value: mockViewModel,
+      builder: (context, child) {
+        return const MaterialApp(
+          home: RecoverAccountScreen(),
+        );
+      },
+    );
+  }
+
+
+  testWidgets('Register Account screen displays fields and send button',
+      (WidgetTester tester) async {
+
+    await tester.pumpWidget(createLoginScreen(mockViewModel));
+    await tester.pump();
+
+    expect(find.byType(TitleSlogan), findsOneWidget);
+    expect(find.byType(TextEmail), findsOneWidget);
+    expect(find.byType(Requestbutton), findsOneWidget);
+    expect(find.byType(TextAndLink), findsOneWidget);
+  });
+
+
+
+  testWidgets('Recover account sending request', (WidgetTester tester) async {
+    await tester.pumpWidget(createLoginScreen(mockViewModel));
+
+    final sendButton = find.text('Enviar');
+
+    await tester.tap(sendButton);
+    await tester.pump();
+
+    verify(mockCommand0.execute()).called(1);
+  });
+
+
+  testWidgets('Recover account user input', (WidgetTester tester) async {
+
+    await tester.pumpWidget(createLoginScreen(mockViewModel));
+
+    const email = 'test@example.com';
+
+
+    await tester.enterText(find.byType(TextEmail), email);
+    await tester.pumpAndSettle();
+
+    expect(mockViewModel.emailController.text, email);
+  });
+
+
+}
diff --git a/test/ui/recover_account/view/recover_account_test.mocks.dart b/test/ui/recover_account/view/recover_account_test.mocks.dart
new file mode 100644
index 0000000..33c99e3
--- /dev/null
+++ b/test/ui/recover_account/view/recover_account_test.mocks.dart
@@ -0,0 +1,290 @@
+// Mocks generated by Mockito 5.4.4 from annotations
+// in aranduapp/test/ui/recover_account/view/recover_account_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i6;
+
+import 'package:aranduapp/core/state/command.dart' as _i3;
+import 'package:aranduapp/ui/recover_account/viewModel/recover_account_view_model.dart'
+    as _i5;
+import 'package:async/async.dart' as _i4;
+import 'package:flutter/material.dart' as _i1;
+import 'package:mockito/mockito.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeGlobalKey_0<T extends _i1.State<_i1.StatefulWidget>>
+    extends _i2.SmartFake implements _i1.GlobalKey<T> {
+  _FakeGlobalKey_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeTextEditingController_1 extends _i2.SmartFake
+    implements _i1.TextEditingController {
+  _FakeTextEditingController_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeCommand0_2<T> extends _i2.SmartFake implements _i3.Command0<T> {
+  _FakeCommand0_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeResult_3<T1> extends _i2.SmartFake implements _i4.Result<T1> {
+  _FakeResult_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [RecoverAccountViewModel].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRecoverAccountViewModel extends _i2.Mock
+    implements _i5.RecoverAccountViewModel {
+  @override
+  _i1.GlobalKey<_i1.FormState> get formKey => (super.noSuchMethod(
+        Invocation.getter(#formKey),
+        returnValue: _FakeGlobalKey_0<_i1.FormState>(
+          this,
+          Invocation.getter(#formKey),
+        ),
+        returnValueForMissingStub: _FakeGlobalKey_0<_i1.FormState>(
+          this,
+          Invocation.getter(#formKey),
+        ),
+      ) as _i1.GlobalKey<_i1.FormState>);
+
+  @override
+  set formKey(_i1.GlobalKey<_i1.FormState>? _formKey) => super.noSuchMethod(
+        Invocation.setter(
+          #formKey,
+          _formKey,
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  _i1.TextEditingController get emailController => (super.noSuchMethod(
+        Invocation.getter(#emailController),
+        returnValue: _FakeTextEditingController_1(
+          this,
+          Invocation.getter(#emailController),
+        ),
+        returnValueForMissingStub: _FakeTextEditingController_1(
+          this,
+          Invocation.getter(#emailController),
+        ),
+      ) as _i1.TextEditingController);
+
+  @override
+  set emailController(_i1.TextEditingController? _emailController) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #emailController,
+          _emailController,
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  _i3.Command0<void> get recoverCommand => (super.noSuchMethod(
+        Invocation.getter(#recoverCommand),
+        returnValue: _FakeCommand0_2<void>(
+          this,
+          Invocation.getter(#recoverCommand),
+        ),
+        returnValueForMissingStub: _FakeCommand0_2<void>(
+          this,
+          Invocation.getter(#recoverCommand),
+        ),
+      ) as _i3.Command0<void>);
+
+  @override
+  set recoverCommand(_i3.Command0<void>? _recoverCommand) => super.noSuchMethod(
+        Invocation.setter(
+          #recoverCommand,
+          _recoverCommand,
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  void addListener(dynamic listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void removeListener(dynamic listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
+
+/// A class which mocks [Command0].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCommand0<T> extends _i2.Mock implements _i3.Command0<T> {
+  @override
+  _i6.Future<_i4.Result<T>> Function() get action => (super.noSuchMethod(
+        Invocation.getter(#action),
+        returnValue: () => _i6.Future<_i4.Result<T>>.value(_FakeResult_3<T>(
+          this,
+          Invocation.getter(#action),
+        )),
+        returnValueForMissingStub: () =>
+            _i6.Future<_i4.Result<T>>.value(_FakeResult_3<T>(
+          this,
+          Invocation.getter(#action),
+        )),
+      ) as _i6.Future<_i4.Result<T>> Function());
+
+  @override
+  bool get isError => (super.noSuchMethod(
+        Invocation.getter(#isError),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  bool get isOk => (super.noSuchMethod(
+        Invocation.getter(#isOk),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  bool get running => (super.noSuchMethod(
+        Invocation.getter(#running),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  _i6.Future<_i4.Result<T>> execute() => (super.noSuchMethod(
+        Invocation.method(
+          #execute,
+          [],
+        ),
+        returnValue: _i6.Future<_i4.Result<T>>.value(_FakeResult_3<T>(
+          this,
+          Invocation.method(
+            #execute,
+            [],
+          ),
+        )),
+        returnValueForMissingStub:
+            _i6.Future<_i4.Result<T>>.value(_FakeResult_3<T>(
+          this,
+          Invocation.method(
+            #execute,
+            [],
+          ),
+        )),
+      ) as _i6.Future<_i4.Result<T>>);
+
+  @override
+  void addListener(dynamic listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void removeListener(dynamic listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
diff --git a/test/ui/register_account/view/register_account_view_test.dart b/test/ui/register_account/view/register_account_view_test.dart
new file mode 100644
index 0000000..8bc36cf
--- /dev/null
+++ b/test/ui/register_account/view/register_account_view_test.dart
@@ -0,0 +1,156 @@
+import 'package:aranduapp/core/state/command.dart';
+import 'package:aranduapp/ui/register_account/view/register_account_view.dart';
+import 'package:aranduapp/ui/shared/ErrorPopUp.dart';
+import 'package:aranduapp/ui/shared/TextAndLink.dart';
+import 'package:aranduapp/ui/shared/TextEmail.dart';
+import 'package:aranduapp/ui/shared/TextPassword.dart';
+import 'package:aranduapp/ui/shared/TitleSlogan.dart';
+import 'package:async/async.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:provider/provider.dart';
+
+@GenerateNiceMocks([MockSpec<RegisterAccountViewModel>(), MockSpec<Command0>()])
+import 'package:aranduapp/ui/register_account/viewModel/register_view_model.dart';
+
+import 'register_account_view_test.mocks.dart';
+
+void main() {
+  late MockRegisterAccountViewModel mockViewModel;
+  late MockCommand0 mockCommand0;
+
+  setUp(() {
+    mockViewModel = MockRegisterAccountViewModel();
+    mockCommand0 = MockCommand0();
+
+    when(mockCommand0.execute()).thenAnswer((_) async => Result.value(null));
+
+    when(mockViewModel.registerCommand).thenReturn(mockCommand0);
+    when(mockViewModel.formKey).thenReturn(GlobalKey<FormState>());
+    when(mockViewModel.nameController).thenReturn(TextEditingController());
+    when(mockViewModel.emailController).thenReturn(TextEditingController());
+    when(mockViewModel.userNameController).thenReturn(TextEditingController());
+    when(mockViewModel.passwordController).thenReturn(TextEditingController());
+    when(mockViewModel.isTermsAccepted).thenReturn(false);
+  });
+
+  Widget createLoginScreen(MockRegisterAccountViewModel mockViewModel) {
+    return ChangeNotifierProvider<RegisterAccountViewModel>.value(
+      value: mockViewModel,
+      builder: (context, child) {
+        return const MaterialApp(
+          home: RegisterAccountScreen(),
+        );
+      },
+    );
+  }
+
+  testWidgets('Register Account screen displays fields and send button',
+      (WidgetTester tester) async {
+    when(mockViewModel.registerCommand).thenReturn(
+        Command0<void>(() => Future.delayed(const Duration(seconds: 1))));
+
+    await tester.pumpWidget(createLoginScreen(mockViewModel));
+    await tester.pump();
+
+    expect(find.byType(TitleSlogan), findsOneWidget);
+    expect(find.byKey(const Key('nameField')), findsOneWidget);
+    expect(find.byKey(const Key('userNameField')), findsOneWidget);
+    expect(find.byType(TextEmail), findsOneWidget);
+    expect(find.byType(TextPassWord), findsOneWidget);
+    expect(find.byType(Checkbox), findsOneWidget);
+
+    expect(find.text('Registrar'), findsOneWidget);
+    expect(find.byType(TextAndLink), findsOneWidget);
+  });
+
+  testWidgets('Test sending the request', (WidgetTester tester) async {
+    await tester.pumpWidget(createLoginScreen(mockViewModel));
+
+    final sendButton = find.text('Registrar');
+
+    await tester.tap(sendButton);
+    await tester.pump();
+
+    verify(mockCommand0.execute()).called(1);
+  });
+
+  testWidgets('Register Account Test User Input', (WidgetTester tester) async {
+    await tester.pumpWidget(createLoginScreen(mockViewModel));
+
+    const name = 'test';
+    const email = 'test@example.com';
+    const userName = 'test123';
+    const password = 'password123';
+
+    await tester.pumpAndSettle();
+
+    await tester.enterText(find.byKey(const Key('nameField')), name);
+    await tester.enterText(find.byKey(const Key('userNameField')), userName);
+    await tester.enterText(find.byType(TextEmail), email);
+    await tester.enterText(find.byType(TextPassWord), password);
+    await tester.pumpAndSettle();
+
+    expect(mockViewModel.nameController.text, name);
+    expect(mockViewModel.userNameController.text, userName);
+    expect(mockViewModel.passwordController.text, password);
+    expect(mockViewModel.emailController.text, email);
+  });
+
+  testWidgets('Checkbox shows correct value when initially unchecked', (WidgetTester tester) async {
+    when(mockViewModel.isTermsAccepted).thenReturn(false);
+
+    await tester.pumpWidget(createLoginScreen(mockViewModel));
+    await tester.pumpAndSettle();
+
+    Checkbox checkbox = tester.widget(find.byType(Checkbox));
+    expect(checkbox.value, false);
+
+    await tester.tap(find.byType(Checkbox));
+
+    verify(mockViewModel.setToggleTermsAccepted(true)).called(1);
+  });
+
+
+  testWidgets('Checkbox shows correct value when initially checked', (WidgetTester tester) async {
+    when(mockViewModel.isTermsAccepted).thenReturn(true);
+
+    await tester.pumpWidget(createLoginScreen(mockViewModel));
+    await tester.pumpAndSettle();
+
+    Checkbox checkbox = tester.widget(find.byType(Checkbox));
+    expect(checkbox.value, true);
+
+    await tester.tap(find.byType(Checkbox));
+
+    verify(mockViewModel.setToggleTermsAccepted(false)).called(1);
+  });
+
+  testWidgets('Register Account user notification snackbar',
+      (WidgetTester tester) async {
+    when(mockCommand0.isOk).thenReturn(true);
+
+    await tester.pumpWidget(createLoginScreen(mockViewModel));
+    await tester.pumpAndSettle();
+
+    expect(find.byType(SnackBar), findsOneWidget);
+  });
+
+  testWidgets('Register Account user notification popup error',
+      (WidgetTester tester) async {
+    when(mockViewModel.registerCommand).thenReturn(mockCommand0);
+    when(mockCommand0.isError).thenReturn(true);
+
+    const error = 'error message.';
+
+    when(mockCommand0.result).thenReturn(Result.error(error));
+
+    await tester.pumpWidget(createLoginScreen(mockViewModel));
+    await tester.pumpAndSettle();
+
+    expect(find.byType(ErrorPopUp), findsOneWidget);
+    expect(find.text(error), findsOneWidget);
+  });
+}
diff --git a/test/ui/register_account/view/register_account_view_test.mocks.dart b/test/ui/register_account/view/register_account_view_test.mocks.dart
new file mode 100644
index 0000000..f785872
--- /dev/null
+++ b/test/ui/register_account/view/register_account_view_test.mocks.dart
@@ -0,0 +1,336 @@
+// Mocks generated by Mockito 5.4.4 from annotations
+// in aranduapp/test/ui/register_account/view/register_account_view_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i6;
+
+import 'package:aranduapp/core/state/command.dart' as _i3;
+import 'package:aranduapp/ui/register_account/viewModel/register_view_model.dart'
+    as _i5;
+import 'package:async/async.dart' as _i4;
+import 'package:flutter/material.dart' as _i1;
+import 'package:mockito/mockito.dart' as _i2;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeGlobalKey_0<T extends _i1.State<_i1.StatefulWidget>>
+    extends _i2.SmartFake implements _i1.GlobalKey<T> {
+  _FakeGlobalKey_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeTextEditingController_1 extends _i2.SmartFake
+    implements _i1.TextEditingController {
+  _FakeTextEditingController_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeCommand0_2<T> extends _i2.SmartFake implements _i3.Command0<T> {
+  _FakeCommand0_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+class _FakeResult_3<T1> extends _i2.SmartFake implements _i4.Result<T1> {
+  _FakeResult_3(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
+
+/// A class which mocks [RegisterAccountViewModel].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockRegisterAccountViewModel extends _i2.Mock
+    implements _i5.RegisterAccountViewModel {
+  @override
+  _i1.GlobalKey<_i1.FormState> get formKey => (super.noSuchMethod(
+        Invocation.getter(#formKey),
+        returnValue: _FakeGlobalKey_0<_i1.FormState>(
+          this,
+          Invocation.getter(#formKey),
+        ),
+        returnValueForMissingStub: _FakeGlobalKey_0<_i1.FormState>(
+          this,
+          Invocation.getter(#formKey),
+        ),
+      ) as _i1.GlobalKey<_i1.FormState>);
+
+  @override
+  _i1.TextEditingController get nameController => (super.noSuchMethod(
+        Invocation.getter(#nameController),
+        returnValue: _FakeTextEditingController_1(
+          this,
+          Invocation.getter(#nameController),
+        ),
+        returnValueForMissingStub: _FakeTextEditingController_1(
+          this,
+          Invocation.getter(#nameController),
+        ),
+      ) as _i1.TextEditingController);
+
+  @override
+  _i1.TextEditingController get emailController => (super.noSuchMethod(
+        Invocation.getter(#emailController),
+        returnValue: _FakeTextEditingController_1(
+          this,
+          Invocation.getter(#emailController),
+        ),
+        returnValueForMissingStub: _FakeTextEditingController_1(
+          this,
+          Invocation.getter(#emailController),
+        ),
+      ) as _i1.TextEditingController);
+
+  @override
+  _i1.TextEditingController get userNameController => (super.noSuchMethod(
+        Invocation.getter(#userNameController),
+        returnValue: _FakeTextEditingController_1(
+          this,
+          Invocation.getter(#userNameController),
+        ),
+        returnValueForMissingStub: _FakeTextEditingController_1(
+          this,
+          Invocation.getter(#userNameController),
+        ),
+      ) as _i1.TextEditingController);
+
+  @override
+  _i1.TextEditingController get passwordController => (super.noSuchMethod(
+        Invocation.getter(#passwordController),
+        returnValue: _FakeTextEditingController_1(
+          this,
+          Invocation.getter(#passwordController),
+        ),
+        returnValueForMissingStub: _FakeTextEditingController_1(
+          this,
+          Invocation.getter(#passwordController),
+        ),
+      ) as _i1.TextEditingController);
+
+  @override
+  bool get isTermsAccepted => (super.noSuchMethod(
+        Invocation.getter(#isTermsAccepted),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  set isTermsAccepted(bool? _isTermsAccepted) => super.noSuchMethod(
+        Invocation.setter(
+          #isTermsAccepted,
+          _isTermsAccepted,
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  _i3.Command0<void> get registerCommand => (super.noSuchMethod(
+        Invocation.getter(#registerCommand),
+        returnValue: _FakeCommand0_2<void>(
+          this,
+          Invocation.getter(#registerCommand),
+        ),
+        returnValueForMissingStub: _FakeCommand0_2<void>(
+          this,
+          Invocation.getter(#registerCommand),
+        ),
+      ) as _i3.Command0<void>);
+
+  @override
+  set registerCommand(_i3.Command0<void>? _registerCommand) =>
+      super.noSuchMethod(
+        Invocation.setter(
+          #registerCommand,
+          _registerCommand,
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  void setToggleTermsAccepted(bool? value) => super.noSuchMethod(
+        Invocation.method(
+          #setToggleTermsAccepted,
+          [value],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void addListener(dynamic listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void removeListener(dynamic listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
+
+/// A class which mocks [Command0].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockCommand0<T> extends _i2.Mock implements _i3.Command0<T> {
+  @override
+  _i6.Future<_i4.Result<T>> Function() get action => (super.noSuchMethod(
+        Invocation.getter(#action),
+        returnValue: () => _i6.Future<_i4.Result<T>>.value(_FakeResult_3<T>(
+          this,
+          Invocation.getter(#action),
+        )),
+        returnValueForMissingStub: () =>
+            _i6.Future<_i4.Result<T>>.value(_FakeResult_3<T>(
+          this,
+          Invocation.getter(#action),
+        )),
+      ) as _i6.Future<_i4.Result<T>> Function());
+
+  @override
+  bool get isError => (super.noSuchMethod(
+        Invocation.getter(#isError),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  bool get isOk => (super.noSuchMethod(
+        Invocation.getter(#isOk),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  bool get running => (super.noSuchMethod(
+        Invocation.getter(#running),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  bool get hasListeners => (super.noSuchMethod(
+        Invocation.getter(#hasListeners),
+        returnValue: false,
+        returnValueForMissingStub: false,
+      ) as bool);
+
+  @override
+  _i6.Future<_i4.Result<T>> execute() => (super.noSuchMethod(
+        Invocation.method(
+          #execute,
+          [],
+        ),
+        returnValue: _i6.Future<_i4.Result<T>>.value(_FakeResult_3<T>(
+          this,
+          Invocation.method(
+            #execute,
+            [],
+          ),
+        )),
+        returnValueForMissingStub:
+            _i6.Future<_i4.Result<T>>.value(_FakeResult_3<T>(
+          this,
+          Invocation.method(
+            #execute,
+            [],
+          ),
+        )),
+      ) as _i6.Future<_i4.Result<T>>);
+
+  @override
+  void addListener(dynamic listener) => super.noSuchMethod(
+        Invocation.method(
+          #addListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void removeListener(dynamic listener) => super.noSuchMethod(
+        Invocation.method(
+          #removeListener,
+          [listener],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void dispose() => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+
+  @override
+  void notifyListeners() => super.noSuchMethod(
+        Invocation.method(
+          #notifyListeners,
+          [],
+        ),
+        returnValueForMissingStub: null,
+      );
+}
diff --git a/test/widget_test.dart b/test/widget_test.dart
deleted file mode 100644
index 975faa0..0000000
--- a/test/widget_test.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility in the flutter_test package. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:aranduapp/main.dart';
-
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
-
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
-}