From bac9853ab1a245f3af77eabedb7ab987228bac55 Mon Sep 17 00:00:00 2001
From: priyanka <priyankahadpad4@gmail.com>
Date: Thu, 21 Mar 2024 00:32:12 -0700
Subject: [PATCH] conflict resolve

---
 lib/Utils/text.dart                 |  9 ---------
 lib/view/MainScreen/HomeScreen.dart |  1 +
 lib/view/MainScreen/ShortTrade.dart | 16 +++++++---------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/lib/Utils/text.dart b/lib/Utils/text.dart
index 561da46..413446d 100644
--- a/lib/Utils/text.dart
+++ b/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'),
   );
diff --git a/lib/view/MainScreen/HomeScreen.dart b/lib/view/MainScreen/HomeScreen.dart
index 99c18ca..a114796 100644
--- a/lib/view/MainScreen/HomeScreen.dart
+++ b/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';
diff --git a/lib/view/MainScreen/ShortTrade.dart b/lib/view/MainScreen/ShortTrade.dart
index affb8b8..c6693d2 100644
--- a/lib/view/MainScreen/ShortTrade.dart
+++ b/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),
     );
   }