From 36cacabeb77b0e8500e668ae49d8d94111d2dfd6 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Mon, 30 Jan 2017 11:20:41 -0300
Subject: [PATCH] Fix build in release mode (#193)

---
 Makefile                             | 13 ++-----------
 service/store/configureStore.prod.js |  3 ++-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index b2fac3070..fde70ff95 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: run run-ios run-android check-style test clean post-install
 .PHONY: check-ios-target prepare-ios-build build-ios after-ios-build
-.PHONY: check-android-target prepare-android-build build-android after-android-build
+.PHONY: check-android-target prepare-android-build build-android
 
 ios_target := $(filter-out build-ios,$(MAKECMDGOALS))
 android_target := $(filter-out build-android,$(MAKECMDGOALS))
@@ -103,9 +103,6 @@ ifneq ($(ios_target), $(filter $(ios_target), dev beta release))
 endif
 
 prepare-ios-build:
-	# We need to do this as the react-native packager minifies the output and that is causing issues
-	@sed -i'' -e 's|--dev $$DEV|--dev true|g' ./node_modules/react-native/packager/react-native-xcode.sh
-
 	@node ./node_modules/react-native/local-cli/cli.js start --reset-cache & echo $$! > server.PID
 
 do-build-ios:
@@ -114,7 +111,6 @@ do-build-ios:
 
 after-ios-build:
 	@echo Cleaning up
-	@sed -i'' -e 's|--dev true|--dev $$DEV|g' ./node_modules/react-native/packager/react-native-xcode.sh
 	@kill -9 `cat server.PID` && rm server.PID
 
 build-ios: | check-ios-target pre-run check-style prepare-ios-build do-build-ios after-ios-build
@@ -127,17 +123,12 @@ endif
 
 prepare-android-build:
 	@rm -rf ./node_modules/react-native/local-cli/templates/HelloWorld
-	@sed -i'' -e 's|def devEnabled = !targetName.toLowerCase().contains("release")|def devEnabled = true|g' ./node_modules/react-native/react.gradle
 
 do-build-android:
 	@echo "Building android $(android_target) app"
 	@cd fastlane && fastlane android $(android_target)
 
-after-android-build:
-	@echo Cleaning up
-	@sed -i'' -e 's|def devEnabled = true|def devEnabled = !targetName.toLowerCase().contains("release")|g' ./node_modules/react-native/react.gradle
-
-build-android: | check-android-target pre-run check-style prepare-android-build do-build-android after-android-build
+build-android: | check-android-target pre-run check-style prepare-android-build do-build-android
 
 dev:
 	@:
diff --git a/service/store/configureStore.prod.js b/service/store/configureStore.prod.js
index d52bf278d..daaee3704 100644
--- a/service/store/configureStore.prod.js
+++ b/service/store/configureStore.prod.js
@@ -7,8 +7,9 @@ import serviceReducer from 'service/reducers';
 import thunk from 'redux-thunk';
 
 export default function configureServiceStore(preloadedState, appReducer) {
+    const baseReducer = combineReducers(Object.assign({}, serviceReducer, appReducer));
     return createStore(
-        enableBatching(combineReducers({serviceReducer, appReducer})),
+        enableBatching(baseReducer),
         preloadedState,
         applyMiddleware(thunk)
     );