From ba26ac596a6c94e649b31d0a558f6f7fe918b152 Mon Sep 17 00:00:00 2001
From: Hoang Btmrk <hoang@bitmark.com>
Date: Tue, 19 Nov 2024 08:15:01 +0700
Subject: [PATCH] resolve merge conflict

---
 .../preferences/preferences_view.dart         | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/lib/screen/settings/preferences/preferences_view.dart b/lib/screen/settings/preferences/preferences_view.dart
index 686ac8d69..1aaed5a77 100644
--- a/lib/screen/settings/preferences/preferences_view.dart
+++ b/lib/screen/settings/preferences/preferences_view.dart
@@ -35,26 +35,6 @@ class PreferenceView extends StatelessWidget {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Padding(
-            padding: padding,
-            child: PreferenceItem(
-              title: state.authMethodName,
-              description: 'use_device_passcode'.tr(args: [
-                if (state.authMethodName != 'device_passcode'.tr())
-                  state.authMethodName
-                else
-                  'device_passcode'.tr()
-              ]),
-              isEnabled: state.isDevicePasscodeEnabled,
-              onChanged: (value) {
-                final newState = state.copyWith(isDevicePasscodeEnabled: value);
-                context
-                    .read<PreferencesBloc>()
-                    .add(PreferenceUpdateEvent(newState));
-              },
-            ),
-          ),
-          addDivider(),
           Padding(
             padding: padding,
             child: TappableForwardRowWithContent(