Justin van der Merwe justinvdm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/containers/JourneyContainer.js b/src/containers/JourneyContainer.js | |
| index 3cf34db..2bef6f3 100644 | |
| --- a/src/containers/JourneyContainer.js | |
| +++ b/src/containers/JourneyContainer.js | |
| @@ -7,7 +7,7 @@ import { getNextScheduledCall } from 'src/stores/helpers'; | |
| export default connect(state => ({ | |
| - nextScheduledCallDate: getNextScheduledCall(state), | |
| + nextScheduledCallDate: (getNextScheduledCall(state) || 0).callTime, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.travis.yml b/.travis.yml | |
| index b098656..6563192 100644 | |
| --- a/.travis.yml | |
| +++ b/.travis.yml | |
| @@ -20,7 +20,7 @@ android: | |
| - addon-google_apis-google-16 | |
| script: | |
| - npm run ci | |
| -- '[ -z "$TRAVIS_TAG" ] || cd android && ./gradlew assembleRelease -PdisablePreDex' | |
| +- '[ -z "$TRAVIS_TAG" ] || (cd android && ./gradlew assembleRelease -PdisablePreDex)' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.travis.yml b/.travis.yml | |
| index b098656..219c44f 100644 | |
| --- a/.travis.yml | |
| +++ b/.travis.yml | |
| @@ -20,7 +20,7 @@ android: | |
| - addon-google_apis-google-16 | |
| script: | |
| - npm run ci | |
| -- '[ -z "$TRAVIS_TAG" ] || cd android && ./gradlew assembleRelease -PdisablePreDex' | |
| +- cd android && ./gradlew assembleRelease -PdisablePreDex |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.travis.yml b/.travis.yml | |
| index 219c44f..b098656 100644 | |
| --- a/.travis.yml | |
| +++ b/.travis.yml | |
| @@ -20,7 +20,7 @@ android: | |
| - addon-google_apis-google-16 | |
| script: | |
| - npm run ci | |
| -- cd android && ./gradlew assembleRelease -PdisablePreDex | |
| +- '[ -z "$TRAVIS_TAG" ] || cd android && ./gradlew assembleRelease -PdisablePreDex' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.travis.yml b/.travis.yml | |
| index 219c44f..b098656 100644 | |
| --- a/.travis.yml | |
| +++ b/.travis.yml | |
| @@ -20,7 +20,7 @@ android: | |
| - addon-google_apis-google-16 | |
| script: | |
| - npm run ci | |
| -- cd android && ./gradlew assembleRelease -PdisablePreDex | |
| +- '[ -z "$TRAVIS_TAG" ] || cd android && ./gradlew assembleRelease -PdisablePreDex' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/stores/__tests__/helpers-test.js b/src/stores/__tests__/helpers-test.js | |
| index 1d8e8a1..6738650 100644 | |
| --- a/src/stores/__tests__/helpers-test.js | |
| +++ b/src/stores/__tests__/helpers-test.js | |
| @@ -21,6 +21,7 @@ import { | |
| getScheduledCallActivity, | |
| getEvents, | |
| getActivityCallNotes, | |
| + getNextScheduledCall, | |
| } from 'src/stores/helpers'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/components/Stepper/index.js b/src/components/Stepper/index.js | |
| index e048eeb..99a9258 100644 | |
| --- a/src/components/Stepper/index.js | |
| +++ b/src/components/Stepper/index.js | |
| @@ -13,6 +13,9 @@ const Step = ({ | |
| ); | |
| +const renderScene = children => ({ scene: { index } }) => (children[index]); | |
| + |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/views/OnboardingSaving/index.js b/src/views/OnboardingSaving/index.js | |
| index 6e5d780..deae9b7 100644 | |
| --- a/src/views/OnboardingSaving/index.js | |
| +++ b/src/views/OnboardingSaving/index.js | |
| @@ -2,6 +2,10 @@ import React, { PropTypes } from 'react'; | |
| import { OverlayLoading } from 'src/components'; | |
| +// TODO remove once save race condition is fixed | |
| +let saved = false; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/android/app/build.gradle b/android/app/build.gradle | |
| index f71619a..cef1e11 100644 | |
| --- a/android/app/build.gradle | |
| +++ b/android/app/build.gradle | |
| @@ -101,7 +101,6 @@ android { | |
| // This enables long timeouts required on slow environments, e.g. Travis | |
| adbOptions { | |
| timeOutInMs 10 * 60 * 1000 // 10 minutes | |
| - installOptions "-d","-t" | |
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/android/app/build.gradle b/android/app/build.gradle | |
| index f71619a..96a8a38 100644 | |
| --- a/android/app/build.gradle | |
| +++ b/android/app/build.gradle | |
| @@ -99,10 +99,10 @@ android { | |
| } | |
| // This enables long timeouts required on slow environments, e.g. Travis | |
| - adbOptions { | |
| - timeOutInMs 10 * 60 * 1000 // 10 minutes |