Merge pull request #2612 from get10101/fix/trades-tab

Do not mix up trades tab with orders tab
get10101 · Jun 5, 2024 · f261e77 · f261e77
2 parents dddf292 + 9bc1c9f
commit f261e77
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/mobile/lib/features/trade/trade_screen.dart b/mobile/lib/features/trade/trade_screen.dart
@@ -109,8 +109,8 @@ class TradeScreen extends StatelessWidget {
                   selectedIndex: 0,
                   keys: const [
                     tradeScreenTabsPositions,
-                    tradeScreenTabsTrades,
-                    tradeScreenTabsOrders
+                    tradeScreenTabsOrders,
+                    tradeScreenTabsTrades
                   ],
                   tabBarViewChildren: [
                     ListView.builder(
@@ -192,13 +192,14 @@ class TradeScreen extends StatelessWidget {
                         );
                       },
                     ),
-                    tradeChangeNotifier.trades.isEmpty
+                    // If there are no orders we early-return with placeholder
+                    orderChangeNotifier.orders.isEmpty
                         ? RichText(
                             text: TextSpan(
                                 style: DefaultTextStyle.of(context).style,
                                 children: <TextSpan>[
                                 const TextSpan(
-                                    text: "You don't have any trades yet.\n\n",
+                                    text: "You don't have any orders yet.\n\n",
                                     style: TextStyle(color: Colors.grey)),
                                 TextSpan(
                                     text: "Buy",
@@ -215,19 +216,18 @@ class TradeScreen extends StatelessWidget {
                         : SingleChildScrollView(
                             physics: const AlwaysScrollableScrollPhysics(),
                             child: Card(
-                                child: Column(
-                              children: tradeChangeNotifier.trades
-                                  .map((trade) => TradeListItem(trade: trade))
-                                  .toList(),
-                            ))),
-                    // If there are no positions we early-return with placeholder
-                    orderChangeNotifier.orders.isEmpty
+                              child: Column(
+                                  children: orderChangeNotifier.orders.values
+                                      .map((e) => OrderListItem(order: e))
+                                      .toList()),
+                            )),
+                    tradeChangeNotifier.trades.isEmpty
                         ? RichText(
                             text: TextSpan(
                                 style: DefaultTextStyle.of(context).style,
                                 children: <TextSpan>[
                                 const TextSpan(
-                                    text: "You don't have any orders yet.\n\n",
+                                    text: "You don't have any trades yet.\n\n",
                                     style: TextStyle(color: Colors.grey)),
                                 TextSpan(
                                     text: "Buy",
@@ -244,11 +244,11 @@ class TradeScreen extends StatelessWidget {
                         : SingleChildScrollView(
                             physics: const AlwaysScrollableScrollPhysics(),
                             child: Card(
-                              child: Column(
-                                  children: orderChangeNotifier.orders.values
-                                      .map((e) => OrderListItem(order: e))
-                                      .toList()),
-                            ))
+                                child: Column(
+                              children: tradeChangeNotifier.trades
+                                  .map((trade) => TradeListItem(trade: trade))
+                                  .toList(),
+                            ))),
                   ],
                 ),
               )