diff --git a/lib/pages/authentication/screens/phone_number.dart b/lib/pages/authentication/screens/phone_number.dart
index 30d01a6..e108de7 100644
--- a/lib/pages/authentication/screens/phone_number.dart
+++ b/lib/pages/authentication/screens/phone_number.dart
@@ -49,10 +49,7 @@ class PhoneNumberInput extends StatelessWidget {
                       .textTheme
                       .caption!
                       .copyWith(color: Theme.of(context).colorScheme.primary),
-                  recognizer: TapGestureRecognizer()
-                    ..onTap = () {
-                      //TODO: Needs implementaion
-                    },
+                  recognizer: TapGestureRecognizer()..onTap = () {},
                 ),
                 const TextSpan(text: 'و\n'),
                 TextSpan(
@@ -61,10 +58,7 @@ class PhoneNumberInput extends StatelessWidget {
                       .textTheme
                       .caption!
                       .copyWith(color: Theme.of(context).colorScheme.primary),
-                  recognizer: TapGestureRecognizer()
-                    ..onTap = () {
-                      //TODO: Needs implementaion
-                    },
+                  recognizer: TapGestureRecognizer()..onTap = () {},
                 ),
                 const TextSpan(text: 'را می‌پذیرم'),
               ],
diff --git a/lib/pages/home/profile/edit_profile/edit_profile.dart b/lib/pages/home/profile/edit_profile/edit_profile.dart
index c459622..3e7abdb 100644
--- a/lib/pages/home/profile/edit_profile/edit_profile.dart
+++ b/lib/pages/home/profile/edit_profile/edit_profile.dart
@@ -25,31 +25,25 @@ class EditProfile extends StatelessWidget {
               DidvanTextField(
                 title: 'نام کاربری',
                 hintText: 'انتخاب نام کاربری (اختیاری)',
-                onChanged: (value) {
-                  //TODO: Needs implementation
-                },
+                onChanged: (value) {},
               ),
               const SizedBox(height: 16),
               DidvanTextField(
                 title: 'ایمیل',
                 hintText: 'مثال: example@email.com',
-                onChanged: (value) {
-                  //TODO: Meeds implementaion
-                },
+                onChanged: (value) {},
               ),
               const SizedBox(height: 16),
               const DidvanTextField(
                 title: 'موبایل',
                 enabled: false,
-                hintText: '09123456789', //TODO: Needs api
+                hintText: '09123456789',
               ),
               const SizedBox(height: 16),
               DidvanSwitch(
-                value: true, //TODO: Needs api
+                value: true,
                 title: 'ورود با اثر انگشت',
-                onChanged: (value) => {
-                  //TODO: Needs implementaion
-                },
+                onChanged: (value) => {},
               ),
               const DidvanDivider(),
               MenuItem(
diff --git a/lib/pages/home/profile/edit_profile/widgets/profile_photo.dart b/lib/pages/home/profile/edit_profile/widgets/profile_photo.dart
index 7ed6e5a..5ef63a5 100644
--- a/lib/pages/home/profile/edit_profile/widgets/profile_photo.dart
+++ b/lib/pages/home/profile/edit_profile/widgets/profile_photo.dart
@@ -8,9 +8,7 @@ class ProfilePhoto extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: () {
-        //TODO: Needs implementation
-      },
+      onTap: () {},
       child: Center(
         child: Stack(
           children: [
diff --git a/lib/pages/home/profile/edit_profile/widgets/switch.dart b/lib/pages/home/profile/edit_profile/widgets/switch.dart
index 6c07c4e..d122ef4 100644
--- a/lib/pages/home/profile/edit_profile/widgets/switch.dart
+++ b/lib/pages/home/profile/edit_profile/widgets/switch.dart
@@ -32,7 +32,12 @@ class _DidvanSwitchState extends State<DidvanSwitch> {
   Widget build(BuildContext context) {
     return MenuItem(
       title: widget.title,
-      onTap: () => widget.onChanged(_value),
+      onTap: () {
+        setState(
+          () => _value = !_value,
+        );
+        widget.onChanged(_value);
+      },
       icon: widget.icon,
       trailing: CupertinoSwitch(
         activeColor: Theme.of(context).colorScheme.primary,
diff --git a/lib/services/network/request.dart b/lib/services/network/request.dart
index fb2c7b7..5296878 100644
--- a/lib/services/network/request.dart
+++ b/lib/services/network/request.dart
@@ -169,7 +169,6 @@ class RequestService {
   }
 
   String _errorMessageGenerator(http.Response? response) {
-    //TODO: Needs implementation
     return '';
   }
 }
diff --git a/lib/utils/actions_sheet.dart b/lib/utils/actions_sheet.dart
index 0bf6f92..0ba1e37 100644
--- a/lib/utils/actions_sheet.dart
+++ b/lib/utils/actions_sheet.dart
@@ -1,11 +1,9 @@
 import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/assets.dart';
-import 'package:didvan/main.dart';
 import 'package:didvan/models/enums.dart';
 import 'package:didvan/models/view/action_sheet_data.dart';
 import 'package:didvan/widgets/didvan/button.dart';
-import 'package:didvan/widgets/didvan/card.dart';
 import 'package:didvan/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';