Merge #378

378: chore: rename services a bit r=luckysori a=bonomat

- cfd --> trading
- exchange --> combined in trading
- betting --> removed
- DCA --> added

Services updated
![simulator_screenshot_FD250FCB-E0E1-4D05-8F49-7866DB93B629](https://user-images.githubusercontent.com/224613/203896858-a1c01eb6-0c7e-45d0-a1b0-07232f00fd43.png)

Menu updated
![simulator_screenshot_B34EE2D7-D2FD-4463-BEC9-58D652CC89AE](https://user-images.githubusercontent.com/224613/203896872-42590e2d-e375-4d8d-a353-6157891ee4f0.png)

`My CFD` --> `Positions`
![simulator_screenshot_CC3A6D43-BB77-4710-A1BF-4DCFDB415ADC](https://user-images.githubusercontent.com/224613/203896892-e490c671-7cd7-421e-a312-18adcbb0f6a5.png)


![simulator_screenshot_8C03E01E-E18A-4BC0-867C-E2B5671053F7](https://user-images.githubusercontent.com/224613/203896901-0c4f951c-550f-44a3-a2b3-728bd2dbca2a.png)


Co-authored-by: Philipp Hoenisch <philipp@coblox.tech>

Author: bors[bot]

lib/cfd_trading/cfd_order_confirmation.dart

@@ -72,7 +72,7 @@ class _CfdOrderConfirmationState extends State<CfdOrderConfirmation> {
     final contractSymbol = order.contractSymbol.name.toUpperCase();
 
     return Scaffold(
-      appBar: AppBar(title: const Text('CFD Order Confirmation')),
+      appBar: AppBar(title: const Text('Order Confirmation')),
       body: SafeArea(
         child: Container(
           padding: const EdgeInsets.all(20.0),

lib/cfd_trading/cfd_order_detail.dart

@@ -100,7 +100,7 @@ class _CfdOrderDetailState extends State<CfdOrderDetail> {
     }
 
     return Scaffold(
-        appBar: AppBar(title: const Text('CFD Order Details')),
+        appBar: AppBar(title: const Text('Order Details')),
         body: SafeArea(
           child: Container(
               padding: const EdgeInsets.all(20.0),

lib/cfd_trading/cfd_trading.dart

@@ -11,7 +11,7 @@ import 'package:ten_ten_one/app_bar_with_balance.dart';
 import '../models/service_model.dart';
 
 class CfdTrading extends StatefulWidget {
-  static final route = Service.cfd.route;
+  static final route = Service.trade.route;
 
   const CfdTrading({Key? key}) : super(key: key);
 
@@ -47,7 +47,7 @@ class _CfdTradingState extends State<CfdTrading> {
               ),
               BottomNavigationBarItem(
                 icon: Icon(Icons.format_list_bulleted_sharp),
-                label: 'My CFDs',
+                label: 'Positions',
               ),
               BottomNavigationBarItem(
                 icon: Icon(Icons.candlestick_chart_sharp),

lib/main.dart

@@ -179,21 +179,12 @@ class _TenTenOneState extends State<TenTenOneApp> {
         },
       ),
       GoRoute(
-        path: Service.exchange.route,
+        path: Service.dca.route,
         builder: (BuildContext context, GoRouterState state) {
           return const ServicePlaceholder(
-              service: Service.exchange,
+              service: Service.dca,
               description:
-                  "Have you heard of Taro? We sure did - and yes, we are planning to build a non custodial exchange using Taro!");
-        },
-      ),
-      GoRoute(
-        path: Service.sportsbet.route,
-        builder: (BuildContext context, GoRouterState state) {
-          return const ServicePlaceholder(
-              service: Service.sportsbet,
-              description:
-                  "Pick your favourite team and place a bet! Binary sports-bets are in the works - more complex bets to come - soon!");
+                  "When is the best time to buy Bitcoin? Now! DCA is a constant investment strategy to buy smaller amounts of Bitcoin over a period of time, no matter what price. DCA is coming soon!");
         },
       ),
     ],

lib/menu.dart

@@ -41,46 +41,25 @@ class Menu extends StatelessWidget {
               GoRouter.of(context).go("/");
             },
           ),
-          ExpansionTile(
-            title: Text(ServiceGroup.trade.label),
-            leading: Icon(ServiceGroup.trade.icon),
-            initiallyExpanded: true,
-            children: [
-              ListTile(
-                title: Text(Service.cfd.label),
-                leading: Icon(Service.cfd.icon),
-                onTap: () {
-                  GoRouter.of(context).go(Service.cfd.route);
-                },
-              ),
-              ListTile(
-                title: Text(Service.exchange.label),
-                leading: Icon(Service.exchange.icon),
-                onTap: () {
-                  GoRouter.of(context).go(Service.exchange.route);
-                },
-              ),
-            ],
+          ListTile(
+            title: Text(Service.trade.label),
+            leading: Icon(Service.trade.icon),
+            onTap: () {
+              GoRouter.of(context).go(Service.trade.route);
+            },
           ),
           ExpansionTile(
-            title: Text(ServiceGroup.bets.label),
-            leading: Icon(ServiceGroup.bets.icon),
+            title: Text(ServiceGroup.invest.label),
+            leading: Icon(ServiceGroup.invest.icon),
             initiallyExpanded: true,
             children: [
               ListTile(
-                title: Text(Service.sportsbet.label),
-                leading: Icon(Service.sportsbet.icon),
+                title: Text(Service.dca.label),
+                leading: Icon(Service.dca.icon),
                 onTap: () {
-                  GoRouter.of(context).go(Service.sportsbet.route);
+                  GoRouter.of(context).go(Service.dca.route);
                 },
               ),
-            ],
-          ),
-          ExpansionTile(
-            title: Text(ServiceGroup.invest.label),
-            leading: Icon(ServiceGroup.invest.icon),
-            initiallyExpanded: true,
-            children: [
               ListTile(
                 title: Text(Service.savings.label),
                 leading: Icon(Service.savings.icon),

lib/models/service_model.dart

@@ -1,50 +1,47 @@
 import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
-enum ServiceGroup { wallet, trade, bets, invest }
+enum ServiceGroup { wallet, trade, dca, invest }
 
 extension ServiceGroupExtension on ServiceGroup {
   static const labels = {
     ServiceGroup.wallet: "Wallet",
     ServiceGroup.trade: "Trading",
-    ServiceGroup.bets: "Bets",
+    ServiceGroup.dca: "DCA",
     ServiceGroup.invest: "Stacking"
   };
   static const icons = {
     ServiceGroup.wallet: Icons.wallet,
     ServiceGroup.trade: Icons.query_stats,
-    ServiceGroup.bets: Icons.casino,
+    ServiceGroup.dca: FontAwesomeIcons.moneyBill1,
     ServiceGroup.invest: Icons.table_rows
   };
 
   String get label => labels[this]!;
   IconData get icon => icons[this]!;
 }
 
-enum Service { cfd, sportsbet, exchange, savings }
+enum Service { trade, dca, savings }
 
 extension ServiceExtension on Service {
   static const labels = {
-    Service.cfd: "CFD Trading",
-    Service.sportsbet: "Sports Bets",
-    Service.exchange: "Taro Exchange",
+    Service.trade: "Trading",
+    Service.dca: "Dollar Cost Average",
     Service.savings: "Saving"
   };
   static const shortLabels = {
-    Service.cfd: "CFDs",
-    Service.sportsbet: "Bets",
-    Service.exchange: "Exchange",
+    Service.trade: "Trade",
+    Service.dca: "DCA",
     Service.savings: "Savings"
   };
   static const icons = {
-    Service.cfd: Icons.insights,
-    Service.sportsbet: Icons.sports_football,
-    Service.exchange: Icons.currency_exchange,
+    Service.trade: Icons.insights,
+    Service.dca: FontAwesomeIcons.moneyBill1,
     Service.savings: Icons.savings
   };
   static const routes = {
-    Service.cfd: "/cfd-trading",
-    Service.sportsbet: "/sports-bet",
-    Service.exchange: "/exchange",
+    Service.trade: "/trading",
+    Service.dca: "/dca",
     Service.savings: "/savings"
   };
 

lib/wallet/wallet.dart

@@ -7,7 +7,7 @@ import 'package:ten_ten_one/wallet/wallet_dashboard.dart';
 import 'package:ten_ten_one/wallet/wallet_lightning.dart';
 
 class Wallet extends StatefulWidget {
-  static const route = '/cfd-trading';
+  static const route = '/trading';
 
   const Wallet({Key? key}) : super(key: key);
 

lib/wallet/wallet_dashboard.dart

@@ -116,16 +116,12 @@ class ServiceNavigation extends StatelessWidget {
         scrollDirection: Axis.horizontal,
         children: [
           GestureDetector(
-            onTap: () => {GoRouter.of(context).go(Service.cfd.route)},
-            child: const ServiceCard(Service.cfd),
+            onTap: () => {GoRouter.of(context).go(Service.trade.route)},
+            child: const ServiceCard(Service.trade),
           ),
           GestureDetector(
-            onTap: () => {GoRouter.of(context).go(Service.sportsbet.route)},
-            child: const ServiceCard(Service.sportsbet),
-          ),
-          GestureDetector(
-            onTap: () => {GoRouter.of(context).go(Service.exchange.route)},
-            child: const ServiceCard(Service.exchange),
+            onTap: () => {GoRouter.of(context).go(Service.dca.route)},
+            child: const ServiceCard(Service.dca),
           ),
           GestureDetector(
             onTap: () => {GoRouter.of(context).go(Service.savings.route)},

lib/wallet/wallet_lightning.dart

@@ -116,9 +116,9 @@ class ServiceNavigation extends StatelessWidget {
         children: [
           GestureDetector(
             onTap: () => {GoRouter.of(context).go(CfdTrading.route)},
-            child: const ServiceCard(Service.cfd),
+            child: const ServiceCard(Service.trade),
           ),
-          const ServiceCard(Service.sportsbet),
+          const ServiceCard(Service.dca),
         ],
       ),
     );