status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes #4334: Update to react-native 0.55.4 

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
pacamara 2018-05-25 16:16:51 +01:00 committed by Pedro Pombeiro
parent a27134fb44
commit a2762eb19e
No known key found for this signature in database
GPG Key ID: A65DEB11E4BBC647
4 changed files with 1092 additions and 1239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/build.gradle
View File

@ -211,7 +211,7 @@ dependencies {
implementation "com.android.support:appcompat-v7:26.1.0" implementation "com.android.support:appcompat-v7:26.1.0"
// Force using exact RN version instead of relying on gradle dependency resolution // Force using exact RN version instead of relying on gradle dependency resolution
// https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution // https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution
compile ("com.facebook.react:react-native:0.53.3") { force = true } // From node_modules compile ("com.facebook.react:react-native:0.55.4") { force = true } // From node_modules
implementation project(':react-native-i18n') implementation project(':react-native-i18n')
implementation project(':react-native-camera') implementation project(':react-native-camera')
implementation project(':react-native-status') implementation project(':react-native-status')

2314
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -33,7 +33,7 @@
"re-natal": "0.8.1", "re-natal": "0.8.1",
"react": "16.2.0", "react": "16.2.0",
"react-dom": "16.2.0", "react-dom": "16.2.0",
"react-native": "0.53.3", "react-native": "0.55.4",
"react-native-background-timer": "2.0.0", "react-native-background-timer": "2.0.0",
"react-native-camera": "0.10.0", "react-native-camera": "0.10.0",
"react-native-config": "0.9.0", "react-native-config": "0.9.0",

13
src/status_im/utils/http.cljs
View File

@ -38,11 +38,14 @@
:headers {"Cache-Control" "no-cache"} :headers {"Cache-Control" "no-cache"}
:timeout (or timeout-ms http-request-default-timeout-ms)})) :timeout (or timeout-ms http-request-default-timeout-ms)}))
(.then (fn [response] (.then (fn [response]
(let [ok? (.-ok response) (->
ok?' (if valid-response? (.text response)
(and ok? (valid-response? response)) (.then (fn [response-body]
ok?)] (let [ok? (.-ok response)
[(.-_bodyText response) ok?']))) ok?' (if valid-response?
(and ok? (valid-response? response))
ok?)]
[response-body ok?']))))))
(.then (fn [[response ok?]] (.then (fn [[response ok?]]
(cond (cond
(and on-success ok?) (and on-success ok?)