conflict resolve

lib/Utils/text.dart

@@ -231,21 +231,12 @@ Widget text14W300(String text) {
   );
 }
 
-<<<<<<< HEAD
-Widget text14W400(String text) {
-  return Text(
-=======
 
 Widget text14W400(String text) { return Text(
->>>>>>> 9a3ee57750db74808606d8117676461f7d75fd06
     text,
     style: TextStyle(
         fontSize: 14.sp,
         color: Colors.white,
-<<<<<<< HEAD
-=======
-
->>>>>>> 9a3ee57750db74808606d8117676461f7d75fd06
         fontWeight: FontWeight.w400,
         fontFamily: 'manrope'),
   );

lib/view/MainScreen/HomeScreen.dart

@@ -1,3 +1,4 @@
+// import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_svg/svg.dart';

lib/view/MainScreen/ShortTrade.dart

@@ -234,13 +234,10 @@ class _ShortTradeState extends State<ShortTrade> {
   }
 
   void _unlockbottomsheet() {
-    showModalBottomSheet(
-      // isDismissible: false,
-      // enableDrag: false,
-      backgroundColor: Colors.black.withOpacity(0.3),
-      context: context,
-      builder: (BuildContext context) {
-        return commonGlassContainer(
+    Get.bottomSheet(
+      SizedBox(
+        height: 500,
+        child: commonGlassContainer(
           width: double.infinity,
           height: 500,
           borderradius: 0,
@@ -264,8 +261,9 @@ class _ShortTradeState extends State<ShortTrade> {
               ],
             ),
           ),
-        );
-      },
+        ),
+      ),
+      backgroundColor: Colors.black.withOpacity(0.3),
     );
   }