Skip to content

Commit

Permalink
Merge branch 'hotfix/networkerror'
Browse files Browse the repository at this point in the history
  • Loading branch information
bartonhammond committed Dec 9, 2015
2 parents 403e60d + 15276ff commit 1528ca8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
8 changes: 1 addition & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Snowflake ![snowflake](https://cloud.githubusercontent.com/assets/1282364/11599365/1a1c39d2-9a8c-11e5-8819-bc1e48b30525.png)
==================================
#### A React-Native starter mobile app for iOS and Android with a single code base. Using Redux and Immutable, the state of the application is fully testable with Jest, currently at 86% coverage. Snowflake supports Hot Reloading of it's state.
#### A React-Native starter mobile app for iOS and Android with a single code base. Using Redux and Immutable, the state of the application is fully testable with Jest, currently at 86% coverage. Snowflake supports Hot Reloading of its state.

# Content

Expand All @@ -12,7 +12,6 @@ Snowflake ![snowflake](https://cloud.githubusercontent.com/assets/1282364/115993
- [Setup](#setup)
- [Redux State Management](#redux-state-management)
- [FAQ](#faq)
- [Release Notes](#release-notes)

----------

Expand Down Expand Up @@ -288,10 +287,5 @@ In a previous life, I worked with Parse JS SDK and it's based on backbone.js. S

With the Parse Rest API, it's simple, can be tested itself from the command line with curl, it's clear, it's succinct and it's easily replaced with something else, an example such as Mongo/Mongoose without much, if any, impact on the code base.

## Release Notes

- 0.0.1 Dec 4, '15 Initial implementation
- 0.0.2 Dec 6, '15 Hot Reloading. Be sure to ```npm update apsl-react-native-button```due to problem with Jest


######-barton hammond
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "snowflake",
"version": "0.0.3",
"version": "0.0.4",
"private": true,
"jest": {
"scriptPreprocessor": "jestSupport/scriptProcessor.js",
Expand Down
6 changes: 5 additions & 1 deletion src/components/ErrorAlert.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ var ErrorAlert = class ErrorAlertClass{
errorMessage = obj;
}
if (errorMessage !== '') {
this.alerter.alert('Error',errorMessage);
if (!_.isUndefined(errorMessage.message)) {
this.alerter.alert('Error',errorMessage.message);
} else {
this.alerter.alert('Error',errorMessage);
}
}
}//isNull
}
Expand Down
2 changes: 1 addition & 1 deletion src/snowflake.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import profileInitialState from './reducers/profile/profileInitialState';
/**
* The version of the app but not displayed yet
*/
var VERSION='0.0.3';
var VERSION='0.0.4';

/**
*
Expand Down

0 comments on commit 1528ca8

Please sign in to comment.