diff --git a/integration_test/utils_test.dart b/integration_test/utils_test.dart
index d3b4bfca..1f1bedc2 100644
--- a/integration_test/utils_test.dart
+++ b/integration_test/utils_test.dart
@@ -21,7 +21,7 @@ Future<void> _loggedWithMultiLocalsAccount(PatrolIntegrationTester $, [bool forc
     await StorageHelper().set(ProfileStorageKey.clientUUID.key, '7');
     await StorageHelper().set(ProfileStorageKey.ownerUUID.key, '7');
     await StorageHelper().set(ProfileStorageKey.clientName.key, 'FRE ACCESS DEMO');
-    await PhpGroup.respondeVinculo.call(tarefa: 'A');
+    await PhpGroup.resopndeVinculo.call(tarefa: 'A');
     await LicenseRepositoryImpl().resetLicense();
   }
 }
@@ -47,7 +47,7 @@ Future<void> _loggedWithSomeoneLocalAccount(PatrolIntegrationTester $, [bool for
     await StorageHelper().set(ProfileStorageKey.clientUUID.key, '7');
     await StorageHelper().set(ProfileStorageKey.ownerUUID.key, '7');
     await StorageHelper().set(ProfileStorageKey.clientName.key, 'FRE ACCESS DEMO');
-    await PhpGroup.respondeVinculo.call(tarefa: 'A');
+    await PhpGroup.resopndeVinculo.call(tarefa: 'A');
     await LicenseRepositoryImpl().resetLicense();
   }
 }
diff --git a/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart b/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart
index 0b3ddd85..141400e6 100644
--- a/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart
+++ b/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart
@@ -140,7 +140,7 @@ class _BottomArrowLinkedLocalsComponentWidgetState extends State<BottomArrowLink
   Future<dynamic> _fetchResponseLink(String status, String cliID) async {
     try {
       await StorageHelper().set(ProfileStorageKey.clientUUID.key, cliID);
-      var response = await PhpGroup.respondeVinculo.call(tarefa: status);
+      var response = await PhpGroup.resopndeVinculo.call(tarefa: status);
 
       if (response.jsonBody['error'] == false) {
         return {
diff --git a/lib/features/backend/api_requests/api_calls.dart b/lib/features/backend/api_requests/api_calls.dart
index 1b205891..3219ac27 100644
--- a/lib/features/backend/api_requests/api_calls.dart
+++ b/lib/features/backend/api_requests/api_calls.dart
@@ -31,23 +31,26 @@ class PhpGroup extends Api {
   static ForgotPasswordCall forgotPasswordCall = ForgotPasswordCall();
   static ChangePasswordCall changePasswordCall = ChangePasswordCall();
   static GetLocalsCall getLocalsCall = GetLocalsCall();
-  static PostScheduleVisitorCall postScheduleVisitorCall = PostScheduleVisitorCall();
+  static PostScheduleVisitorCall postScheduleVisitorCall =
+      PostScheduleVisitorCall();
   static PostScheduleVisitCall postScheduleVisitCall = PostScheduleVisitCall();
   static GetScheduleVisitCall getScheduleVisitCall = GetScheduleVisitCall();
   static GetDadosCall getDadosCall = GetDadosCall();
   static GetVisitorByDocCall getVisitorByDocCall = GetVisitorByDocCall();
   static GetFotoVisitanteCall getFotoVisitanteCall = GetFotoVisitanteCall();
-  static PostProvVisitSchedulingCall postProvVisitSchedulingCall = PostProvVisitSchedulingCall();
+  static PostProvVisitSchedulingCall postProvVisitSchedulingCall =
+      PostProvVisitSchedulingCall();
   static GetVisitsCall getVisitsCall = GetVisitsCall();
   static DeleteVisitCall deleteVisitCall = DeleteVisitCall();
   static GetPessoasLocalCall getPessoasLocalCall = GetPessoasLocalCall();
-  static RespondeSolicitacaoCall respondeSolicitacaoCall = RespondeSolicitacaoCall();
+  static RespondeSolicitacaoCall respondeSolicitacaoCall =
+      RespondeSolicitacaoCall();
   static GetAccessCall getAccessCall = GetAccessCall();
   static GetLiberationsCall getLiberationsCall = GetLiberationsCall();
   static GetMessagesCall getMessagesCall = GetMessagesCall();
   static ChangeNotifica changeNotifica = ChangeNotifica();
   static UpdateIDE updateIDE = UpdateIDE();
-  static RespondeVinculo respondeVinculo = RespondeVinculo();
+  static RespondeVinculo resopndeVinculo = RespondeVinculo();
   static ChangePass changePass = ChangePass();
   static ChangePanic changePanic = ChangePanic();
   static DeleteAccount deleteAccount = DeleteAccount();
@@ -60,22 +63,74 @@ class PhpGroup extends Api {
   static GetPetPhoto getPetPhoto = GetPetPhoto();
   static UnregisterDevice unregisterDevice = UnregisterDevice();
   static GetVehiclesByProperty getVehiclesByProperty = GetVehiclesByProperty();
-  static GetResidentsByProperty getResidentsByProperty = GetResidentsByProperty();
+  static GetResidentsByProperty getResidentsByProperty =
+      GetResidentsByProperty();
   static GetOpenedVisits getOpenedVisits = GetOpenedVisits();
   GetLicense getLicense = GetLicense();
   static GetProvSchedules getProvSchedules = GetProvSchedules();
   static RegisterVehicle registerVehicle = RegisterVehicle();
   static UpdateVehicle updateVehicle = UpdateVehicle();
   static DeleteVehicle deleteVehicle = DeleteVehicle();
+  static CancelVehicle cancelVehicle = CancelVehicle();
+}
+
+class CancelVehicle {
+  Future<ApiCallResponse> call({
+    required final String vehicleId,
+    required final String licensePlate,
+    required final String model,
+    required final String color,
+  }) async {
+    final String baseUrl = PhpGroup.getBaseUrl();
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    const String atividade = 'cancelDeleteRequest';
+
+    return await ApiManager.instance.makeApiCall(
+      callName: atividade,
+      apiUrl: '$baseUrl/processRequest.php',
+      callType: ApiCallType.POST,
+      headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+      params: {
+        'devUUID': devUUID,
+        'userUUID': userUUID,
+        'cliID': cliID,
+        'atividade': atividade,
+        'vehicleId': vehicleId,
+        'licensePlate': licensePlate,
+        'model': model,
+        'color': color
+      },
+      bodyType: BodyType.X_WWW_FORM_URL_ENCODED,
+      returnBody: true,
+      encodeBodyUtf8: false,
+      decodeUtf8: false,
+      cache: false,
+      isStreamingApi: false,
+      alwaysAllowBody: false,
+    );
+  }
 }
 
 class DeleteVehicle {
-  Future<ApiCallResponse> call({vehicleId}) async {
+  Future<ApiCallResponse> call({
+    required final String vehicleId,
+    required final String licensePlate,
+    required final String model,
+    required final String color,
+  }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
-    const String atividade = 'excluirVeiculo';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    const String atividade = 'deleteVehicle';
 
     return await ApiManager.instance.makeApiCall(
       callName: 'deleteVehicle',
@@ -90,6 +145,9 @@ class DeleteVehicle {
         'cliID': cliID,
         'atividade': atividade,
         'vehicleId': vehicleId,
+        'licensePlate': licensePlate,
+        'model': model,
+        'color': color
       },
       bodyType: BodyType.X_WWW_FORM_URL_ENCODED,
       returnBody: true,
@@ -110,10 +168,13 @@ class RegisterVehicle {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
-    const String atividade = 'cadastrarVeiculo';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    const String atividade = 'insertVehicle';
 
     return await ApiManager.instance.makeApiCall(
       callName: 'registerVehicle',
@@ -150,10 +211,13 @@ class UpdateVehicle {
     final String? model,
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
-    const String atividade = 'atualizarVeiculo';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    const String atividade = 'updateVehicleToInsertRequest';
 
     return await ApiManager.instance.makeApiCall(
       callName: 'updateVehicle',
@@ -185,9 +249,12 @@ class UpdateVehicle {
 class GetProvSchedules {
   Future<ApiCallResponse> call(final String page, final String status) async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'getAgendamentoProv';
     const String pageSize = '10';
     final bool isFiltered = status != '' && status != '.*';
@@ -220,9 +287,12 @@ class GetProvSchedules {
 class GetOpenedVisits {
   Future<ApiCallResponse> call(final String page) async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'getOpenedVisits';
     const String pageSize = '10';
     return await ApiManager.instance.makeApiCall(
@@ -252,9 +322,12 @@ class GetOpenedVisits {
 class GetResidentsByProperty {
   Future<ApiCallResponse> call(final String page) async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = await StorageHelper().get(ProfileStorageKey.devUUID.key) ?? '';
-    final String userUUID = await StorageHelper().get(ProfileStorageKey.userUUID.key) ?? '';
-    final String cliID = await StorageHelper().get(ProfileStorageKey.clientUUID.key) ?? '';
+    final String devUUID =
+        await StorageHelper().get(ProfileStorageKey.devUUID.key) ?? '';
+    final String userUUID =
+        await StorageHelper().get(ProfileStorageKey.userUUID.key) ?? '';
+    final String cliID =
+        await StorageHelper().get(ProfileStorageKey.clientUUID.key) ?? '';
     const String atividade = 'getResidentsByProperty';
     const String pageSize = '10';
     return await ApiManager.instance.makeApiCall(
@@ -283,9 +356,12 @@ class GetResidentsByProperty {
 class GetVehiclesByProperty {
   Future<ApiCallResponse> call(final String page) async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'getVehiclesByProperty';
     const String pageSize = '10';
     return await ApiManager.instance.makeApiCall(
@@ -316,9 +392,12 @@ class GetVehiclesByProperty {
 class GetLicense {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
 
     return await ApiManager.instance.makeApiCall(
       callName: 'getLicense',
@@ -347,8 +426,10 @@ class GetLicense {
 class UnregisterDevice {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
 
     return await ApiManager.instance.makeApiCall(
       callName: 'unregisterDevice',
@@ -375,9 +456,12 @@ class UnregisterDevice {
 class DeletePet {
   Future<ApiCallResponse> call({final int? petID = 0}) async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'excluirPet';
 
     return await ApiManager.instance.makeApiCall(
@@ -420,9 +504,12 @@ class UpdatePet {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'atualizarPet';
 
     return await ApiManager.instance.makeApiCall(
@@ -443,7 +530,9 @@ class UpdatePet {
         'species': species,
         'breed': breed,
         if (color != '') 'color': color,
-        if (birthdayDate != '') 'birthdayDate': ValidatorUtil.toISO8601USA('dd/MM/yyyy', birthdayDate!),
+        if (birthdayDate != '')
+          'birthdayDate':
+              ValidatorUtil.toISO8601USA('dd/MM/yyyy', birthdayDate!),
         'gender': gender,
         'size': size,
         if (notes != '') 'notes': notes,
@@ -466,9 +555,12 @@ class GetPets {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'consultaPets';
 
     return await ApiManager.instance.makeApiCall(
@@ -500,9 +592,12 @@ class GetPetPhoto {
   Future<ApiCallResponse> call({final int? petId}) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'consultaFotoPet';
 
     return await ApiManager.instance.makeApiCall(
@@ -543,9 +638,12 @@ class RegisterPet {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'cadastrarPet';
 
     return await ApiManager.instance.makeApiCall(
@@ -565,7 +663,9 @@ class RegisterPet {
         'species': species,
         'breed': breed,
         if (color != '') 'color': color,
-        if (birthdayDate != '') 'birthdayDate': ValidatorUtil.toISO8601USA('dd/MM/yyyy', birthdayDate!),
+        if (birthdayDate != '')
+          'birthdayDate':
+              ValidatorUtil.toISO8601USA('dd/MM/yyyy', birthdayDate!),
         'gender': gender,
         'size': size,
         if (notes != '') 'notes': notes,
@@ -588,9 +688,12 @@ class BuscaEnconcomendas {
     final String? adresseeType,
     final String? status,
   }) async {
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'getEncomendas';
 
     final String baseUrl = PhpGroup.getBaseUrl();
@@ -632,9 +735,12 @@ class CancelaVisita {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'cancelaVisita';
 
     return await ApiManager.instance.makeApiCall(
@@ -666,8 +772,10 @@ class CancelaVisita {
 
 class DeleteAccount {
   Future<ApiCallResponse> call() async {
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
 
     final String baseUrl = PhpGroup.getBaseUrl();
     return await ApiManager.instance.makeApiCall(
@@ -698,9 +806,12 @@ class ChangePanic {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'updVisitado';
 
     return await ApiManager.instance.makeApiCall(
@@ -734,9 +845,12 @@ class ChangePass {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'updVisitado';
 
     return await ApiManager.instance.makeApiCall(
@@ -770,9 +884,12 @@ class RespondeVinculo {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
 
     return await ApiManager.instance.makeApiCall(
       callName: 'respondeVinculo',
@@ -804,9 +921,12 @@ class ChangeNotifica {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'updVisitado';
 
     return await ApiManager.instance.makeApiCall(
@@ -838,10 +958,14 @@ class UpdateIDE {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliUUID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
-    final String newIde = (await StorageHelper().get(ProfileStorageKey.userDevUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliUUID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String newIde =
+        (await StorageHelper().get(ProfileStorageKey.userDevUUID.key)) ?? '';
     const String atividade = 'updVisitado';
 
     return await ApiManager.instance.makeApiCall(
@@ -873,9 +997,12 @@ class UpdToken {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String token = (await StorageHelper().get(SecureStorageKey.token.value)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String token =
+        (await StorageHelper().get(SecureStorageKey.token.value)) ?? '';
 
     return await ApiManager.instance.makeApiCall(
       callName: 'updToken',
@@ -902,11 +1029,17 @@ class UpdToken {
 class LoginCall {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String email = (await StorageHelper().get(SecureStorageKey.email.value)) ?? '';
-    final String password = (await StorageHelper().get(SecureStorageKey.password.value)) ?? '';
-    final String type = (await StorageHelper().get(SecureStorageKey.deviceType.value)) ?? '';
-    final String description = (await StorageHelper().get(SecureStorageKey.deviceDescription.value)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String email =
+        (await StorageHelper().get(SecureStorageKey.email.value)) ?? '';
+    final String password =
+        (await StorageHelper().get(SecureStorageKey.password.value)) ?? '';
+    final String type =
+        (await StorageHelper().get(SecureStorageKey.deviceType.value)) ?? '';
+    final String description =
+        (await StorageHelper().get(SecureStorageKey.deviceDescription.value)) ??
+            '';
     late final String token;
     try {
       token = await FirebaseMessagingService.getToken();
@@ -989,9 +1122,12 @@ class ChangePasswordCall {
     required final String psswd,
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
 
     return await ApiManager.instance.makeApiCall(
       callName: 'changePassword',
@@ -1050,8 +1186,10 @@ class GetLocalsCall {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = await StorageHelper().get(ProfileStorageKey.devUUID.key) ?? '';
-    final String userUUID = await StorageHelper().get(ProfileStorageKey.userUUID.key) ?? '';
+    final String devUUID =
+        await StorageHelper().get(ProfileStorageKey.devUUID.key) ?? '';
+    final String userUUID =
+        await StorageHelper().get(ProfileStorageKey.userUUID.key) ?? '';
 
     return await ApiManager.instance
         .makeApiCall(
@@ -1092,9 +1230,12 @@ class PostScheduleVisitorCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'putVisitante';
 
     return await ApiManager.instance.makeApiCall(
@@ -1147,9 +1288,12 @@ class PostScheduleVisitCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'putVisita';
 
     return await ApiManager.instance.makeApiCall(
@@ -1201,9 +1345,12 @@ class GetScheduleVisitCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliUUID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliUUID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'getVisitas';
 
     return await ApiManager.instance.makeApiCall(
@@ -1475,9 +1622,12 @@ class GetDadosCall {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliUUID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliUUID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'getDados';
 
     return await ApiManager.instance
@@ -1513,7 +1663,8 @@ class GetDadosCall {
         response,
         r'''$.error_msg''',
       ));
-  String? visitedDesNomeStr(dynamic response) => castToType<String>(getJsonField(
+  String? visitedDesNomeStr(dynamic response) =>
+      castToType<String>(getJsonField(
         response,
         r'''$.visitado.DES_NOME''',
       ));
@@ -1521,27 +1672,33 @@ class GetDadosCall {
         response,
         r'''$.visitado.VDO_ID''',
       ));
-  String? visitedVDOTNomeStr(dynamic response) => castToType<String>(getJsonField(
+  String? visitedVDOTNomeStr(dynamic response) =>
+      castToType<String>(getJsonField(
         response,
         r'''$.visitado.VDO_NOME''',
       ));
-  String? visitedVDOTipoStr(dynamic response) => castToType<String>(getJsonField(
+  String? visitedVDOTipoStr(dynamic response) =>
+      castToType<String>(getJsonField(
         response,
         r'''$.visitado.VDO_TIPO''',
       ));
-  String? visitedVDOImeiStr(dynamic response) => castToType<String>(getJsonField(
+  String? visitedVDOImeiStr(dynamic response) =>
+      castToType<String>(getJsonField(
         response,
         r'''$.visitado.VDO_IMEI''',
       ));
-  String? visitedVDODocumentoStr(dynamic response) => castToType<String>(getJsonField(
+  String? visitedVDODocumentoStr(dynamic response) =>
+      castToType<String>(getJsonField(
         response,
         r'''$.visitado.VDO_DOCUMENTO''',
       ));
-  String? visitedVDOEmailStr(dynamic response) => castToType<String>(getJsonField(
+  String? visitedVDOEmailStr(dynamic response) =>
+      castToType<String>(getJsonField(
         response,
         r'''$.visitado.VDO_EMAIL''',
       ));
-  String? visitedVDOStatusWebStr(dynamic response) => castToType<String>(getJsonField(
+  String? visitedVDOStatusWebStr(dynamic response) =>
+      castToType<String>(getJsonField(
         response,
         r'''$.visitado.VDO_STATUSWEB''',
       ));
@@ -1589,7 +1746,8 @@ class GetDadosCall {
         response,
         r'''$.visitado.DES_ID''',
       ));
-  String? visitedVDoNotTerceirosStr(dynamic response) => castToType<String>(getJsonField(
+  String? visitedVDoNotTerceirosStr(dynamic response) =>
+      castToType<String>(getJsonField(
         response,
         r'''$.visitado.VDO_NOTTERCEIROS''',
       ));
@@ -1658,7 +1816,8 @@ class GetDadosCall {
           .map((x) => castToType<String>(x))
           .withoutNulls
           .toList();
-  List<String>? levelNACIndPermiteReentradaStrList(dynamic response) => (getJsonField(
+  List<String>? levelNACIndPermiteReentradaStrList(dynamic response) =>
+      (getJsonField(
         response,
         r'''$.niveis[:].NAC_INDPERMITEREENTRADA''',
         true,
@@ -1676,7 +1835,8 @@ class GetDadosCall {
           .map((x) => castToType<String>(x))
           .withoutNulls
           .toList();
-  List<String>? levelNACTempoAntiCaronaStrList(dynamic response) => (getJsonField(
+  List<String>? levelNACTempoAntiCaronaStrList(dynamic response) =>
+      (getJsonField(
         response,
         r'''$.niveis[:].NAC_TEMPOANTICARONA''',
         true,
@@ -1710,9 +1870,12 @@ class GetVisitorByDocCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'getVisitante';
 
     return await ApiManager.instance.makeApiCall(
@@ -1764,9 +1927,12 @@ class GetFotoVisitanteCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'getFotoVisitante';
 
     return await ApiManager.instance.makeApiCall(
@@ -1803,9 +1969,12 @@ class PostProvVisitSchedulingCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'putAgendamentoProv';
 
     return await ApiManager.instance.makeApiCall(
@@ -1852,9 +2021,12 @@ class GetVisitsCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'getVisitas';
 
     return await ApiManager.instance.makeApiCall(
@@ -2115,9 +2287,12 @@ class DeleteVisitCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'cancelaVisita';
 
     return await ApiManager.instance.makeApiCall(
@@ -2158,10 +2333,14 @@ class GetPessoasLocalCall {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String ownerUUID = (await StorageHelper().get(ProfileStorageKey.ownerUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliUUID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String ownerUUID =
+        (await StorageHelper().get(ProfileStorageKey.ownerUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliUUID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
 
     return await ApiManager.instance.makeApiCall(
       callName: 'getPessoasLocal',
@@ -2224,9 +2403,12 @@ class RespondeSolicitacaoCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliUUID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliUUID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'respondeSolicitacao';
 
     return await ApiManager.instance.makeApiCall(
@@ -2274,9 +2456,12 @@ class GetAccessCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliUUID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliUUID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'getAcessos';
 
     return await ApiManager.instance.makeApiCall(
@@ -2523,9 +2708,12 @@ class GetLiberationsCall {
     final StreamController<ApiCallResponse> controller = StreamController();
 
     Future.microtask(() async {
-      final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-      final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-      final String cliUUID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+      final String devUUID =
+          (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+      final String userUUID =
+          (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+      final String cliUUID =
+          (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
       const String atividade = 'getSolicitacoes';
 
       try {
@@ -2715,9 +2903,12 @@ class GetMessagesCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
-    final String userUUID = (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
-    final String cliUUID = (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
+    final String devUUID =
+        (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
+    final String userUUID =
+        (await StorageHelper().get(ProfileStorageKey.userUUID.key)) ?? '';
+    final String cliUUID =
+        (await StorageHelper().get(ProfileStorageKey.clientUUID.key)) ?? '';
     const String atividade = 'getMensagens';
 
     return await ApiManager.instance.makeApiCall(
diff --git a/lib/features/local/data/data_sources/locals_remote_data_source.dart b/lib/features/local/data/data_sources/locals_remote_data_source.dart
index 85ec65fa..0babde3a 100644
--- a/lib/features/local/data/data_sources/locals_remote_data_source.dart
+++ b/lib/features/local/data/data_sources/locals_remote_data_source.dart
@@ -224,7 +224,7 @@ class LocalsRemoteDataSourceImpl implements LocalsRemoteDataSource {
         enText: 'Device unlinked successfully',
         ptText: 'Dispositivo desvinculado com sucesso',
       );
-      final bool status = await PhpGroup.respondeVinculo.call(tarefa: 'I').then((value) async {
+      final bool status = await PhpGroup.resopndeVinculo.call(tarefa: 'I').then((value) async {
         if (value.jsonBody['error'] == false) {
           await StorageHelper().set(ProfileStorageKey.clientName.key, '');
           await StorageHelper().set(ProfileStorageKey.ownerName.key, '');
diff --git a/lib/features/local/utils/local_util.dart b/lib/features/local/utils/local_util.dart
index 35b6ed37..88214b27 100644
--- a/lib/features/local/utils/local_util.dart
+++ b/lib/features/local/utils/local_util.dart
@@ -44,7 +44,7 @@ class LocalUtil {
       await StorageHelper().set(ProfileStorageKey.clientName.key, locals[0]['CLI_NOME']);
       await StorageHelper().set(ProfileStorageKey.ownerName.key, locals[0]['CLU_OWNER_DSC']);
 
-      var response = await PhpGroup.respondeVinculo.call(tarefa: 'A');
+      var response = await PhpGroup.resopndeVinculo.call(tarefa: 'A');
       if (response.jsonBody['error'] == true) {
         await StorageHelper().set(ProfileStorageKey.clientUUID.key, '');
         await StorageHelper().set(ProfileStorageKey.ownerUUID.key, '');
diff --git a/lib/pages/vehicles_on_the_property/vehicle_model.dart b/lib/pages/vehicles_on_the_property/vehicle_model.dart
index 23704747..a279e972 100644
--- a/lib/pages/vehicles_on_the_property/vehicle_model.dart
+++ b/lib/pages/vehicles_on_the_property/vehicle_model.dart
@@ -317,7 +317,12 @@ mixin _VehicleHistoryScreenModel on _BaseVehiclePage {
 
   Future<void> processDeleteRequest(dynamic item) async {
     int id = item['vehicleId'];
-    await PhpGroup.deleteVehicle.call(vehicleId: id).then((value) {
+    await PhpGroup.deleteVehicle.call(
+      vehicleId: item['vehicleId'], 
+      licensePlate: item['licensePlate'], 
+      model: item['model'], 
+      color: item['color'], 
+      ).then((value) {
       context.pop(value);
       context.pop(value);
 
@@ -408,18 +413,31 @@ mixin _VehicleHistoryScreenModel on _BaseVehiclePage {
   }
 
   Future<ApiCallResponse> processCancelDeleteRequest(dynamic item) async {
-    final int id = item['vehicleId'];
-    return await PhpGroup.deleteVehicle.call(vehicleId: id);
+    return await PhpGroup.cancelVehicle.call(
+      vehicleId: item['vehicleId'], 
+      licensePlate: item['licensePlate'], 
+      model: item['model'], 
+      color: item['color'], 
+      );
   }
 
   Future<ApiCallResponse> processCancelUpdateRequest(dynamic item) async {
-    final int id = item['vehicleId'];
-    return await PhpGroup.deleteVehicle.call(vehicleId: id);
+    return await PhpGroup.deleteVehicle.call(
+    vehicleId: item['vehicleId'], 
+      licensePlate: item['licensePlate'], 
+      model: item['model'], 
+      color: item['color'], 
+      
+      );
   }
 
   Future<ApiCallResponse> processCancelCreateRequest(dynamic item) async {
-    final int id = item['vehicleId'];
-    return await PhpGroup.deleteVehicle.call(vehicleId: id);
+    return await PhpGroup.deleteVehicle.call(
+      vehicleId: item['vehicleId'], 
+      licensePlate: item['licensePlate'], 
+      model: item['model'], 
+      color: item['color'], 
+      );
   }
 
   Map<String, String> generateLabelsHashMap(dynamic item) {
diff --git a/lib/shared/extensions/string_extensions.dart b/lib/shared/extensions/string_extensions.dart
index dc0b62c6..32290e61 100644
--- a/lib/shared/extensions/string_extensions.dart
+++ b/lib/shared/extensions/string_extensions.dart
@@ -9,6 +9,12 @@ extension StringNullableExtensions on String? {
     if (this == '') return true;
     return false;
   }
+
+  bool isNotNullAndEmpty() {
+    if (this == null) return false;
+    if (this == '') return false;
+    return true;
+  }
 }
 
 extension StringExtensions on String {