From ac243de2ecf85d75622fd9a28e710ecf20463404 Mon Sep 17 00:00:00 2001
From: wsdt <kevin.riedl.privat@gmail.com>
Date: Wed, 22 May 2019 20:45:30 +0200
Subject: [PATCH] resolved #24

---
 .../DashboardTabScreen/DashboardTabScreen.conf.ts    |  5 +++--
 .../DashboardTabScreen/DashboardTabScreenRoutes.tsx  | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/s_frontend/s_mobile/src/mvc/views/pages/DashboardTabScreen/DashboardTabScreen.conf.ts b/s_frontend/s_mobile/src/mvc/views/pages/DashboardTabScreen/DashboardTabScreen.conf.ts
index fe059a6..c0a89d6 100644
--- a/s_frontend/s_mobile/src/mvc/views/pages/DashboardTabScreen/DashboardTabScreen.conf.ts
+++ b/s_frontend/s_mobile/src/mvc/views/pages/DashboardTabScreen/DashboardTabScreen.conf.ts
@@ -1,4 +1,5 @@
 import {BottomTabNavigatorConfig, createAppContainer} from "react-navigation"
+import p from "../../../controllers/parseScss"
 import {SwitchRouter} from "../../components/system/SwitchRouter/SwitchRouter"
 import {DrawerNavigator} from "../../components/system/TabRouter/DrawerNavigator"
 import * as styles from "../../components/system/TabRouter/TabBar.scss"
@@ -9,9 +10,9 @@ import {routesObj} from "./DashboardTabScreenRoutes"
 const tabConf: BottomTabNavigatorConfig = {
     initialRouteName: routesStr.NewsfeedStack.Home,
     tabBarOptions: {
-        iconStyle: styles.tabIcon,
+        iconStyle: p(styles.tabIcon),
         showIcon: true,
-        tabStyle: styles.tabBarStyle,
+        style: p(styles.tabBarStyle),
     },
 }
 
diff --git a/s_frontend/s_mobile/src/mvc/views/pages/DashboardTabScreen/DashboardTabScreenRoutes.tsx b/s_frontend/s_mobile/src/mvc/views/pages/DashboardTabScreen/DashboardTabScreenRoutes.tsx
index 3e3a8dd..7926c35 100644
--- a/s_frontend/s_mobile/src/mvc/views/pages/DashboardTabScreen/DashboardTabScreenRoutes.tsx
+++ b/s_frontend/s_mobile/src/mvc/views/pages/DashboardTabScreen/DashboardTabScreenRoutes.tsx
@@ -4,9 +4,9 @@ import {NavigationRouteConfigMap} from "react-navigation"
 import p from "../../../controllers/parseScss"
 import * as styles from "../../components/system/TabRouter/TabBar.scss"
 import {routesStr} from "./DashboardTabScreen.constants"
-import {ChallengeTabRoutes} from "./tab_challenges/ChallengeTabRoutes"
-import {NewsfeedTabRoutes} from "./tab_newsfeed/NewsfeedTabRoutes"
-import {ProfileTabRoutes} from "./tab_profile/ProfileTabRoutes"
+import {ChallengeTab} from "./tab_challenges/ChallengeTab"
+import {NewsfeedTab} from "./tab_newsfeed/NewsfeedTab"
+import {ProfileTab} from "./tab_profile/ProfileTab"
 
 
 export const routesObj: NavigationRouteConfigMap = {
@@ -17,7 +17,7 @@ export const routesObj: NavigationRouteConfigMap = {
             ),
             tabBarLabel: "Challenges",
         },
-        screen: ChallengeTabRoutes,
+        screen: ChallengeTab,
     },
     [routesStr.NewsfeedStack.Home]: {
         navigationOptions: {
@@ -26,7 +26,7 @@ export const routesObj: NavigationRouteConfigMap = {
             ),
             tabBarLabel: "Newsfeed",
         },
-        screen: NewsfeedTabRoutes,
+        screen: NewsfeedTab,
     },
     [routesStr.ProfileStack.Home]: {
         navigationOptions: {
@@ -35,6 +35,6 @@ export const routesObj: NavigationRouteConfigMap = {
             ),
             tabBarLabel: "Profile",
         },
-        screen: ProfileTabRoutes,
+        screen: ProfileTab,
     },
 }
\ No newline at end of file