Merge branch 'main' into splash

lib/view/MainScreen/ShortTrade.dart

@@ -30,7 +30,7 @@ class _ShortTradeState extends State<ShortTrade> {
     return Scaffold(
       key: _scaffoldKey1,
       backgroundColor: Colors.black,
-      drawer: Container(width: 320.w, child: SideMenu()),
+      drawer: Container(child: SideMenu()),
       extendBody: true,
       appBar: AppBar(
         scrolledUnderElevation: 0.0,
@@ -50,6 +50,7 @@ class _ShortTradeState extends State<ShortTrade> {
             ),
           ),
         ),
+        // title: text22W600('Short'),
       ),
 
       // CommonAppbar(
@@ -136,7 +137,7 @@ class _ShortTradeState extends State<ShortTrade> {
   Widget ActiveCallsTab() {
     return Obx(() {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (selectedIndex == 1) _unlockbottomsheet();
+        if (selectedIndex == 1 || selectedIndex == 2) _unlockbottomsheet();
       });
       return selectedIndex == 0
           ? Column(
@@ -235,25 +236,35 @@ class _ShortTradeState extends State<ShortTrade> {
 
   void _unlockbottomsheet() {
     Get.bottomSheet(
-      SizedBox(
-        height: 200,
-        child: commonGlassContainer(
-          width: double.infinity,
-          height: 200,
-          borderradius: 2,
-          customWidget: Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              // Image.asset(
-              //   'assets/images/png/Group 1000003722.png',
-              //   height: 100.h,
-              // ),
-              // sizedBoxHeight(25.h),
-              text20W400('Please subscribed to unlock'),
-              sizedBoxHeight(30.h),
-              CommonBtn(text: 'Subscribe Now'),
-            ],
+
+      commonGlassContainer(
+        width: double.infinity,
+        height: 439.h,
+        borderradius: 4,
+        customWidget: Center(
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: 35.w),
+            child: Column(
+              children: [
+                sizedBoxHeight(50.h),
+                // Image.asset(
+                //   'assets/images/png/Group 1000003722.png',
+                //   height: 100.h,
+                // ),
+                // sizedBoxHeight(25.h),
+                text20W400('Please subscribed to unlock'),
+                sizedBoxHeight(30.h),
+                CommonBtn(
+                  text: 'Subscribe Now',
+                  onTap: () {},
+                ),
+
+                SizedBox(
+                  height: 100,
+                )
+              ],
+            ),
+
           ),
         ),
       ),