diff --git a/android/app/build.gradle b/android/app/build.gradle index e95007ab0d..0bf0c0708a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -260,9 +260,6 @@ dependencies { implementation project(':react-native-background-timer') implementation project(':react-native-svg') implementation 'com.android.support:multidex:1.0.2' - compile (project(':react-native-http-bridge')) { - exclude group: "com.google.android.gms" - } implementation project(':react-native-splash-screen') implementation project(':react-native-image-resizer') implementation project(':react-native-dialogs') @@ -276,7 +273,6 @@ dependencies { implementation project(':react-native-status') implementation project(':react-native-fs') implementation project(':react-native-image-crop-picker') - implementation project(':react-native-securerandom') implementation project(':react-native-webview-bridge') implementation project(':react-native-touch-id') implementation project(':react-native-config') diff --git a/android/app/src/main/java/im/status/ethereum/MainApplication.java b/android/app/src/main/java/im/status/ethereum/MainApplication.java index 1f6337e9fc..8438e4ffc5 100644 --- a/android/app/src/main/java/im/status/ethereum/MainApplication.java +++ b/android/app/src/main/java/im/status/ethereum/MainApplication.java @@ -19,8 +19,6 @@ import com.reactnative.ivpusic.imagepicker.PickerPackage; import com.rnfs.RNFSPackage; import com.rnfingerprint.FingerprintAuthPackage; -import net.rhogan.rnsecurerandom.RNSecureRandomPackage; - import org.devio.rn.splashscreen.SplashScreenReactPackage; import org.reactnative.camera.RNCameraPackage; @@ -34,7 +32,6 @@ import im.status.ethereum.module.StatusPackage; import io.invertase.firebase.RNFirebasePackage; import io.invertase.firebase.messaging.RNFirebaseMessagingPackage; import io.invertase.firebase.notifications.RNFirebaseNotificationsPackage; -import me.alwx.HttpServer.HttpServerReactPackage; import com.chirag.RNMail.*; import com.clipsub.RNShake.RNShakeEventPackage; import com.swmansion.gesturehandler.react.RNGestureHandlerPackage; @@ -59,10 +56,8 @@ public class MainApplication extends MultiDexApplication implements ReactApplica new RNFirebasePackage(), new RNFirebaseMessagingPackage(), new RNFirebaseNotificationsPackage(), - new RNSecureRandomPackage(), new BackgroundTimerPackage(), new SvgPackage(), - new HttpServerReactPackage(), new SplashScreenReactPackage(), statusPackage, new RNStatusKeycardPackage(), diff --git a/android/settings.gradle b/android/settings.gradle index 13ae23099c..799aa051a2 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -10,15 +10,11 @@ include ':react-native-nfc-manager' project(':react-native-nfc-manager').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-nfc-manager/android') include ':react-native-firebase' project(':react-native-firebase').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-firebase/android') -include ':react-native-securerandom' -project(':react-native-securerandom').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-securerandom/android') include ':react-native-background-timer' project(':react-native-background-timer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-timer/android') include ':react-native-svg' project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android') include ':app' -include ':react-native-http-bridge' -project(':react-native-http-bridge').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-http-bridge/android') include ':react-native-splash-screen' project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android') include ':react-native-image-resizer' diff --git a/clj-rn.conf.edn b/clj-rn.conf.edn index f427046879..ea9c124566 100644 --- a/clj-rn.conf.edn +++ b/clj-rn.conf.edn @@ -4,7 +4,8 @@ :figwheel-bridge "./figwheel-bridge.js" ;; JS modules - :js-modules ["bignumber.js" + :js-modules ["buffer" + "bignumber.js" "react-native-languages" "i18n-js" "dismissKeyboard" @@ -18,14 +19,12 @@ "react-native-dialogs" "react-native-image-resizer" "react-native-image-crop-picker" - "react-native-securerandom" "react-native-svg" "react-native-webview-bridge" "react-native-firebase" "react-native-touch-id" "web3-utils" "chance" - "react-native-http-bridge" "emojilib" "eth-phishing-detect" "react-native-config" @@ -45,7 +44,8 @@ "react-native-shake" "@react-native-community/netinfo"] ;; Desktop modules - :desktop-modules ["bignumber.js" + :desktop-modules ["buffer" + "bignumber.js" "react-native-languages" "i18n-js" "dismissKeyboard" @@ -56,10 +56,8 @@ "react-native-fs" "react-native-dialogs" "react-native-image-crop-picker" - "react-native-securerandom" "react-native-webview-bridge" "chance" - "react-native-http-bridge" "emojilib" "eth-phishing-detect" "react-native-config" diff --git a/components/src/status_im/ui/components/react.cljs b/components/src/status_im/ui/components/react.cljs index 00f2d027db..5d3327cb27 100644 --- a/components/src/status_im/ui/components/react.cljs +++ b/components/src/status_im/ui/components/react.cljs @@ -146,13 +146,13 @@ :max-font-size-multiplier max-font-size-multiplier :placeholder-text-color colors/text-gray :placeholder (i18n/label :t/type-a-message) - :ref (fn [r] + :ref (fn [r] ;; Store input and its defaultValue ;; one we receive a non-nil ref (when (and r (nil? @input-ref)) (swap! text-input-refs assoc r (:default-value options))) (reset! input-ref r) - (when (:ref options) + (when (:ref options) ((:ref options) r))) :value text} (-> options @@ -236,10 +236,6 @@ (let [clipboard-contents (.getString (.-Clipboard js-dependencies/react-native))] (.then clipboard-contents #(clbk %)))) -;; HTTP Bridge - -(def http-bridge js-dependencies/http-bridge) - ;; KeyboardAvoidingView (defn keyboard-avoiding-view [props & children] diff --git a/desktop_files/package.json.orig b/desktop_files/package.json.orig index 1ec002d035..4994493a5d 100644 --- a/desktop_files/package.json.orig +++ b/desktop_files/package.json.orig @@ -10,10 +10,8 @@ "node_modules/react-native-languages/desktop", "node_modules/react-native-config/desktop", "node_modules/react-native-fs/desktop", - "node_modules/react-native-http-bridge/desktop", "node_modules/react-native-webview-bridge/desktop", "node_modules/react-native-keychain/desktop", - "node_modules/react-native-securerandom/desktop", "modules/react-native-status/desktop", "modules/react-native-desktop-linking/desktop", "modules/react-native-desktop-menu/desktop", @@ -44,7 +42,6 @@ ], "dependencies": { "assert": "1.4.1", - "asyncstorage-down": "4.0.1", "babel-preset-react-native": "5.0.2", "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#v4.0.2-status", "buffer": "3.6.0", @@ -70,21 +67,16 @@ "react-native-dialogs": "0.0.20", "react-native-fetch-polyfill": "1.1.2", "react-native-fs": "git+https://github.com/status-im/react-native-fs.git#v2.9.7-status", - "react-native-http": "git+https://github.com/tradle/react-native-http.git#834492d", - "react-native-http-bridge": "0.6.1", "react-native-image-crop-picker": "0.18.1", "react-native-image-resizer": "1.0.0", - "react-native-invertible-scroll-view": "1.1.0", "react-native-keychain": "git+https://github.com/status-im/react-native-keychain.git#v.3.0.0-4-status", "react-native-languages": "git+https://github.com/status-im/react-native-languages.git#v0.1.1-status", "react-native-navigation-twopane": "git+https://github.com/status-im/react-native-navigation-twopane.git#v0.0.2-status", "react-native-os": "1.1.0", - "react-native-securerandom": "git+https://github.com/status-im/react-native-securerandom.git#0.1.1-2", "react-native-splash-screen": "3.0.6", "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#0.33.16-status-rn049-desktop", "react-navigation": "^2.12.1", "status-conan": "git+https://github.com/status-im/status-conan.git#v1.0.0", - "url": "0.10.3", "web3-utils": "1.0.0-beta.36" }, "devDependencies": { diff --git a/desktop_files/yarn.lock b/desktop_files/yarn.lock index c5e338a8ad..9c3a835be4 100644 --- a/desktop_files/yarn.lock +++ b/desktop_files/yarn.lock @@ -1323,13 +1323,6 @@ absolute-path@^0.0.0: resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7" integrity sha1-p4di+9rftSl76ZsV01p4Wy8JW/c= -abstract-leveldown@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.6.1.tgz#f9014a5669b746418e145168dea49a044ae15900" - integrity sha1-+QFKVmm3RkGOFFFo3qSaBErhWQA= - dependencies: - xtend "~4.0.0" - accepts@~1.3.5, accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -1483,11 +1476,6 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -argsarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/argsarray/-/argsarray-0.0.1.tgz#6e7207b4ecdb39b0af88303fa5ae22bda8df61cb" - integrity sha1-bnIHtOzbObCviDA/pa4ivajfYcs= - aria-query@^0.7.0: version "0.7.1" resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.7.1.tgz#26cbb5aff64144b0a825be1846e0b16cfa00b11e" @@ -1623,13 +1611,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= -assert@1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" - integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE= - dependencies: - util "0.10.3" - assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" @@ -1662,17 +1643,6 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= -asyncstorage-down@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/asyncstorage-down/-/asyncstorage-down-4.0.1.tgz#380b484ab629aad86cd6b723e04f08c05a2b0067" - integrity sha1-OAtISrYpqths1rcj4E8IwForAGc= - dependencies: - abstract-leveldown "2.6.1" - argsarray "0.0.1" - d64 "^1.0.0" - ltgt "^2.1.3" - tiny-queue "0.2.0" - atob@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" @@ -2556,11 +2526,6 @@ crypto-random-string@^1.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= -d64@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/d64/-/d64-1.0.0.tgz#4002a87e850cbfc9f9d9706b60fca613a3336e90" - integrity sha1-QAKofoUMv8n52XBrYPymE6MzbpA= - damerau-levenshtein@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz#780cf7144eb2e8dbd1c3bb83ae31100ccc31a414" @@ -2963,11 +2928,6 @@ eventemitter3@^3.0.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== -events@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" - integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= - exec-sh@^0.2.0: version "0.2.2" resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36" @@ -4761,11 +4721,6 @@ lru-cache@^4.0.0, lru-cache@^4.0.1: pseudomap "^1.0.2" yallist "^2.1.2" -ltgt@^2.1.3: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5" - integrity sha1-81ypHEk/e3PaDgdJUwTxezH4fuU= - macos-alias@~0.2.5: version "0.2.11" resolved "https://registry.yarnpkg.com/macos-alias/-/macos-alias-0.2.11.tgz#feeea6c13ba119814a43fc43c470b31e59ef718a" @@ -6275,18 +6230,6 @@ react-native-fetch-polyfill@1.1.2: base-64 "^0.1.0" utf8 "^2.1.1" -react-native-http-bridge@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/react-native-http-bridge/-/react-native-http-bridge-0.6.1.tgz#1b85688174870e9b009692e1a6cdc5f5396c5ca4" - integrity sha512-XnPVdaYkKIC8bRGmADVLhgDO0Evnya3rOExVEzxk6pBJjNUewWljkGHt//OTpb4t7Te6oDqQAwa+gfVtzhRU1A== - -"react-native-http@git+https://github.com/tradle/react-native-http.git#834492d": - version "1.0.0" - resolved "git+https://github.com/tradle/react-native-http.git#834492dbc792b1dec8ec8f0a1c9671f640339f01" - dependencies: - Base64 "~0.2.0" - inherits "~2.0.1" - react-native-image-crop-picker@0.18.1: version "0.18.1" resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.18.1.tgz#ebdbe72def5afb6c69aa6e2ad72fd3a7de8ee408" @@ -6297,16 +6240,6 @@ react-native-image-resizer@1.0.0: resolved "https://registry.yarnpkg.com/react-native-image-resizer/-/react-native-image-resizer-1.0.0.tgz#d47e14943c37938e287fbd639e4db7ceb7fd8917" integrity sha1-1H4UlDw3k44of71jnk23zrf9iRc= -react-native-invertible-scroll-view@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/react-native-invertible-scroll-view/-/react-native-invertible-scroll-view-1.1.0.tgz#bfd50a3f5d66ca12639b7c7a9844ceddd1d16890" - integrity sha1-v9UKP11myhJjm3x6mETO3dHRaJA= - dependencies: - create-react-class "^15.6.0" - prop-types "^15.5.10" - react-clone-referenced-element "^1.0.1" - react-native-scrollable-mixin "^1.0.1" - "react-native-keychain@git+https://github.com/status-im/react-native-keychain.git#v.3.0.0-4-status": version "3.0.0-rc.3" resolved "git+https://github.com/status-im/react-native-keychain.git#5895bafa11e734325eaaffd56dda8ca50bfc5275" @@ -6343,12 +6276,6 @@ react-native-scrollable-mixin@^1.0.1: resolved "https://registry.yarnpkg.com/react-native-scrollable-mixin/-/react-native-scrollable-mixin-1.0.1.tgz#34a32167b64248594154fd0d6a8b03f22740548e" integrity sha1-NKMhZ7ZCSFlBVP0NaosD8idAVI4= -"react-native-securerandom@git+https://github.com/status-im/react-native-securerandom.git#0.1.1-2": - version "0.1.1" - resolved "git+https://github.com/status-im/react-native-securerandom.git#ffff3f91ad9f239fe333880e720b21a3a03a9252" - dependencies: - base64-js "*" - react-native-splash-screen@3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/react-native-splash-screen/-/react-native-splash-screen-3.0.6.tgz#c0bbf2c8ae40a313c4c7044f55e569414ff68332" @@ -7482,11 +7409,6 @@ timed-out@^4.0.0, timed-out@^4.0.1: resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= -tiny-queue@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.0.tgz#c49fcb5c87555be1b4a5df7eb87101d5b78bc9dc" - integrity sha1-xJ/LXIdVW+G0pd9+uHEB1beLydw= - tmp@^0.0.31: version "0.0.31" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7" @@ -7778,13 +7700,6 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= -util@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= - dependencies: - inherits "2.0.1" - utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" @@ -8065,7 +7980,7 @@ xpipe@^1.0.5: resolved "https://registry.yarnpkg.com/xpipe/-/xpipe-1.0.5.tgz#8dd8bf45fc3f7f55f0e054b878f43a62614dafdf" integrity sha1-jdi/Rfw/f1Xw4FS4ePQ6YmFNr98= -xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== diff --git a/externs.js b/externs.js index ce8a04c7b4..904b4482a0 100644 --- a/externs.js +++ b/externs.js @@ -137,7 +137,6 @@ var TopLevel = { "fromWei" : function () {}, "generateAndLoadKey" : function () {}, "generateMnemonic" : function () {}, - "generateSecureRandom" : function () {}, "generateSymKeyFromPassword" : function () {}, "get" : function () {}, "getApplicationInfo" : function () {}, diff --git a/fiddle/src/status_im/react_native/js_dependencies.cljs b/fiddle/src/status_im/react_native/js_dependencies.cljs index 47e8df481c..1a500fb2a9 100644 --- a/fiddle/src/status_im/react_native/js_dependencies.cljs +++ b/fiddle/src/status_im/react_native/js_dependencies.cljs @@ -7,7 +7,6 @@ (def dismiss-keyboard (fn [] #js {})) (def emoji-picker (fn [] #js {:default #js {}})) (def fs (fn [] #js {})) -(def http-bridge (fn [] #js {})) (def i18n #js {:locale "en"}) (def react-native-languages #js {:language "en", :addEventListener (fn []), :removeEventListener (fn [])}) (def image-crop-picker (fn [] #js {})) @@ -45,7 +44,6 @@ :clearInterval js/clearInterval})) (def keychain (fn [] #js {:setGenericPassword (constantly (.resolve js/Promise true))})) -(def secure-random (fn [] #(.resolve js/Promise (clj->js (range 0 %))))) (def react-navigation #js {:NavigationActions #js {}}) (def desktop-menu #js {}) (def desktop-config #js {}) diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj index c0557b7c7c..94cedcb586 100644 --- a/ios/StatusIm.xcodeproj/project.pbxproj +++ b/ios/StatusIm.xcodeproj/project.pbxproj @@ -50,13 +50,11 @@ 9EE89E271E03FCB7007D3C25 /* libSplashScreen.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7F21DE718EF00D694FF /* libSplashScreen.a */; }; 9EE89E2D1E03FD9F007D3C25 /* libimageCropPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 20A5C9531D927137002C4965 /* libimageCropPicker.a */; }; 9EF0836B1F3B53AB00876A8F /* libReactNativeConfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EF083611F3B538B00876A8F /* libReactNativeConfig.a */; }; - AB96C730942E49178F59AE6F /* libRNSecureRandom.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1464A9A9E12F45068947C28F /* libRNSecureRandom.a */; }; ABC194E5221009A800EB06E6 /* libRNLanguages.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ABC194E22210099C00EB06E6 /* libRNLanguages.a */; }; ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; B190FBFB6A9B43EAAF396CD7 /* Inter-BlackItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2006E199700F423E84885CD9 /* Inter-BlackItalic.otf */; }; B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; }; B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; }; - B2DEA0D01E49E33300FA28D6 /* libRCTHttpServer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DEA0B11E49E32000FA28D6 /* libRCTHttpServer.a */; }; B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; }; B957A49EB0DE44D9A31CAF2D /* libRNSVG.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AF2BF381BC7B4EB0887F0091 /* libRNSVG.a */; }; BA68A2377A20496EA737000D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */; }; @@ -160,13 +158,6 @@ remoteGlobalIDString = F12AFB9B1ADAF8F800E0535D; remoteInfo = RNFS; }; - 475D1EF120B73EE000879A77 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = AF409BB755B94FB1BBA01927 /* RNSecureRandom.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 134814201AA4EA6300B7C361; - remoteInfo = RNSecureRandom; - }; 475D1FBF20B7413500879A77 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 475D1F8D20B7413500879A77 /* RNFirebase.xcodeproj */; @@ -356,13 +347,6 @@ remoteGlobalIDString = 3D7682761D8E76B80014119E; remoteInfo = SplashScreen; }; - B2DEA0B01E49E32000FA28D6 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B2DEA0A41E49E32000FA28D6 /* RCTHttpServer.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B29EC9CC1E48BED600704A36; - remoteInfo = RCTHttpServer; - }; B46198BB2210C98F00603CF2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = B461988B2210C98F00603CF2 /* RNCWebView.xcodeproj */; @@ -545,7 +529,6 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = ""; }; 1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = ""; }; - 1464A9A9E12F45068947C28F /* libRNSecureRandom.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSecureRandom.a; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; 17787D310A644038B9357960 /* Inter-ExtraLight-BETA.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-ExtraLight-BETA.otf"; path = "../resources/fonts/Inter-ExtraLight-BETA.otf"; sourceTree = ""; }; 1BF670316EE6470584BB715B /* Inter-ExtraBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-ExtraBoldItalic.otf"; path = "../resources/fonts/Inter-ExtraBoldItalic.otf"; sourceTree = ""; }; @@ -606,14 +589,12 @@ ACA66A8F16CD2FE21F38738B /* Pods-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusIm.debug.xcconfig"; path = "Pods/Target Support Files/Pods-StatusIm/Pods-StatusIm.debug.xcconfig"; sourceTree = ""; }; ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = ""; }; AF2BF381BC7B4EB0887F0091 /* libRNSVG.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSVG.a; sourceTree = ""; }; - AF409BB755B94FB1BBA01927 /* RNSecureRandom.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNSecureRandom.xcodeproj; path = "../node_modules/react-native-securerandom/ios/RNSecureRandom.xcodeproj"; sourceTree = ""; }; B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = ""; }; B23B48FE1E76917B006D4535 /* RobotoMono-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "RobotoMono-Medium.ttf"; sourceTree = ""; }; B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; }; B24FC7FE1DE7195F00D694FF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; }; B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Medium.otf"; path = "../resources/fonts/Inter-Medium.otf"; sourceTree = ""; }; B2A5F42F1DEC36B200174F4D /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; - B2DEA0A41E49E32000FA28D6 /* RCTHttpServer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTHttpServer.xcodeproj; path = "../node_modules/react-native-http-bridge/ios/RCTHttpServer.xcodeproj"; sourceTree = ""; }; B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = StatusIm/Images.xcassets; sourceTree = ""; }; B321D25F4493470980039457 /* Inter-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-BoldItalic.otf"; path = "../resources/fonts/Inter-BoldItalic.otf"; sourceTree = ""; }; B461988B2210C98F00603CF2 /* RNCWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNCWebView.xcodeproj; path = "../node_modules/react-native-webview/ios/RNCWebView.xcodeproj"; sourceTree = ""; }; @@ -649,7 +630,6 @@ E3CDB8AF22BBE460009BFE27 /* libRNScreens.a in Frameworks */, C93242561FE1C68C00FE7099 /* libRCTAnimation.a in Frameworks */, 4C16DE0C1F89508700AA10DB /* JavaScriptCore.framework in Frameworks */, - B2DEA0D01E49E33300FA28D6 /* libRCTHttpServer.a in Frameworks */, 9EE89E271E03FCB7007D3C25 /* libSplashScreen.a in Frameworks */, B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */, B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */, @@ -678,7 +658,6 @@ 8E55E6877F950B81C8D711C5 /* libPods-StatusIm.a in Frameworks */, 9EF0836B1F3B53AB00876A8F /* libReactNativeConfig.a in Frameworks */, B957A49EB0DE44D9A31CAF2D /* libRNSVG.a in Frameworks */, - AB96C730942E49178F59AE6F /* libRNSecureRandom.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -871,14 +850,6 @@ name = Products; sourceTree = ""; }; - 475D1EEE20B73EE000879A77 /* Products */ = { - isa = PBXGroup; - children = ( - 475D1EF220B73EE000879A77 /* libRNSecureRandom.a */, - ); - name = Products; - sourceTree = ""; - }; 475D1F8E20B7413500879A77 /* Products */ = { isa = PBXGroup; children = ( @@ -943,7 +914,6 @@ B461988B2210C98F00603CF2 /* RNCWebView.xcodeproj */, 475D1F8D20B7413500879A77 /* RNFirebase.xcodeproj */, 9EF083381F3B538A00876A8F /* ReactNativeConfig.xcodeproj */, - B2DEA0A41E49E32000FA28D6 /* RCTHttpServer.xcodeproj */, 9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */, B2A5F42F1DEC36B200174F4D /* RCTAnimation.xcodeproj */, 3A7EB0491DD9CABC00A4FCC8 /* SplashScreen.xcodeproj */, @@ -964,7 +934,6 @@ 439B6B4B407A4E2AACAFE5BE /* RCTStatus.xcodeproj */, 5E5A7625B76441D984EA8C0D /* RCTImageResizer.xcodeproj */, 1E74DC52A1E449A2BA858B14 /* RNSVG.xcodeproj */, - AF409BB755B94FB1BBA01927 /* RNSecureRandom.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -1100,14 +1069,6 @@ name = Products; sourceTree = ""; }; - B2DEA0A51E49E32000FA28D6 /* Products */ = { - isa = PBXGroup; - children = ( - B2DEA0B11E49E32000FA28D6 /* libRCTHttpServer.a */, - ); - name = Products; - sourceTree = ""; - }; B461988C2210C98F00603CF2 /* Products */ = { isa = PBXGroup; children = ( @@ -1127,7 +1088,6 @@ 2BEE3436791D42248F853999 /* libRCTImageResizer.a */, AF2BF381BC7B4EB0887F0091 /* libRNSVG.a */, 7F752F17B1E04216B1337A72 /* libRNFIRMessaging.a */, - 1464A9A9E12F45068947C28F /* libRNSecureRandom.a */, 0A9C79F2FD464877A7CC0BC2 /* libRNFirebase.a */, ); name = "Recovered References"; @@ -1260,10 +1220,6 @@ ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */; ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */; }, - { - ProductGroup = B2DEA0A51E49E32000FA28D6 /* Products */; - ProjectRef = B2DEA0A41E49E32000FA28D6 /* RCTHttpServer.xcodeproj */; - }, { ProductGroup = 00C302BC1ABCB91800DB3ED1 /* Products */; ProjectRef = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */; @@ -1344,10 +1300,6 @@ ProductGroup = E3CDB86F22BBD9D2009BFE27 /* Products */; ProjectRef = E3CDB86E22BBD9D2009BFE27 /* RNScreens.xcodeproj */; }, - { - ProductGroup = 475D1EEE20B73EE000879A77 /* Products */; - ProjectRef = AF409BB755B94FB1BBA01927 /* RNSecureRandom.xcodeproj */; - }, { ProductGroup = 4C5F698622815E4E00D26222 /* Products */; ProjectRef = 4C5F698522815E4E00D26222 /* RNShakeEvent.xcodeproj */; @@ -1447,13 +1399,6 @@ remoteRef = 20B7D1191D3F74CD00B70F14 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 475D1EF220B73EE000879A77 /* libRNSecureRandom.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRNSecureRandom.a; - remoteRef = 475D1EF120B73EE000879A77 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 475D1FC020B7413500879A77 /* libRNFirebase.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1643,13 +1588,6 @@ remoteRef = B24FC7F11DE718EF00D694FF /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - B2DEA0B11E49E32000FA28D6 /* libRCTHttpServer.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTHttpServer.a; - remoteRef = B2DEA0B01E49E32000FA28D6 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; B46198BC2210C98F00603CF2 /* libRNCWebView.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -2061,7 +1999,6 @@ "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", "$(SRCROOT)/../node_modules/react-native-config/ios/**", "$(SRCROOT)/../node_modules/react-native-svg/ios/**", - "$(SRCROOT)/../node_modules/react-native-securerandom/ios", "$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS", "$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase", "$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/messaging", @@ -2124,7 +2061,6 @@ "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", "$(SRCROOT)/../node_modules/react-native-config/ios/**", "$(SRCROOT)/../node_modules/react-native-svg/ios/**", - "$(SRCROOT)/../node_modules/react-native-securerandom/ios", "$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS", "$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase", "$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/messaging", diff --git a/mobile_files/DEPENDENCIES.md b/mobile_files/DEPENDENCIES.md new file mode 100644 index 0000000000..bc9c6777cd --- /dev/null +++ b/mobile_files/DEPENDENCIES.md @@ -0,0 +1,170 @@ +## "@react-native-community/netinfo": "^3.2.1" + +no known issue while updating version + +used to monitor network information (connected, expensive, connection type) + +## "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#v4.0.2-status" + +used to work with big numbers in JS +BN.js (used in web3-utils) doesn't support decimals, though we could work without decimals + +should be replaced by JSBI https://github.com/GoogleChromeLabs/jsbi/blob/master/README.md +see web-utils issue: https://github.com/ethereum/web3.js/issues/2171 + +## "buffer": "^5.4.2" + +required by bignumber.js otherwise there is a compilation error + +## "chance": "^1.1.0" + +used to generate guids and random values in `status-im.utils.random` + +## "create-react-class": "15.6.2" + +fixed version because even bugfix update causes compilation error with current version of react-native (0.59) + +internal react library, used by figwheel for instance but also probably react + +## "emojilib": "^2.4.0" + +used for emojis + +## "eth-phishing-detect": "^1.1.13" + +used to check if URL is known for phishing + +## "hi-base32": "^0.5.0" + +used only in `status-im.browser.core` to convert base58 hash into base32 hash +TODO: could be replaced by a simple implementation of ascii to base32 + +## "i18n-js": "^3.3.0" + +used to manage translations + +## "identicon.js": "git+https://github.com/status-im/identicon.js.git#v1.2.1-status" + +TODO: switch to latest upstream version, fork is seriously outdated and changes have been merged to master long time ago +used to generate identicons + +## "qrcode": "^1.4.1" + +used to generate QR code + +## "react": "16.8.3" + +react library, update based on react-native recommendation + +## "react-dom": "16.4.2" + +react library, update based on react-native recommendation + +## "react-native": "git+https://github.com/status-im/react-native.git#v0.59.10" + +react-native + +TODO: forked because of specific markdown handling, should be bountied to be turned into a library so we can go back to upstream version + +## "react-native-background-timer": "^2.1.1" + +used to have setTimeout and setInterval that don't trigger yellow warning about long timeouts + +## "react-native-camera": "git+https://github.com/status-im/react-native-camera.git#v1.1.5-1-status" + +used to read QR code and take profile picture +TODO: update version, this one doesn't work with Android (done in react-native upgrade branch) + +## "react-native-config": "git+https://github.com/status-im/react-native-config.git#0.11.2-1" + +used to fetch config values from env +TODO: not sure fork usage is justified + +## "react-native-dialogs": "^1.0.5" + +used to show dialogs but only in android in list selection `status-im.ui.components.list-selection`, iOS uses action-sheet +TODO: see if we should actually remove it + +## "react-native-fetch-polyfill": "^1.1.3" + +used to be able to put a timeout on fetch request +TODO: check if the fetch timeout is actually aborting the request or only ignoring the callback on the response, if it +doesn't then this is useless and we are better of using a simple seTimeout + +## "react-native-firebase": "5.1.1" + +used to have some stupid notifications and give free metadata to Google + +## "react-native-fs": "^2.14.1" + +used for some filesystem related functions, for instance to get no-backup directory in `status-im.utils.platform` + +## "react-native-gesture-handler": "1.3.0" + +library used by react-navigation +use version recommended by react-navigation + +## "react-native-image-crop-picker": "^0.18.2" + +used for profile picture + +## "react-native-image-resizer": "git+https://github.com/status-im/react-native-image-resizer.git#1.0.##-status" + +used for profile picture + +## "react-native-keychain": "git+https://github.com/status-im/react-native-keychain.git#v.3.0.0-status" + +used for storing password when user saves password +TODO: check if fork is necessary, merge with upstream? + +## "react-native-languages": "^3.0.2" + +TODO DEPRECATED, should be replaced with https://github.com/react-native-community/react-native-localize +used to get user language and interact with i18n.js + +## "react-native-mail": "git+https://github.com/status-im/react-native-mail.git#v3.0.8_status" + +used to send email to support when phone is shaked + +## "react-native-navigation-twopane": "git+https://github.com/status-im/react-native-navigation-twopane.git#v0.0.2-status" + +used by desktop + +## "react-native-screens": "1.0.0-alpha.22" + +used by react-navigation + +TODO: update once bug is fixed for Android that causes crash when app is back from background after being put in background with hardware backbutton press + +## "react-native-shake": "^3.3.1" + +used to send email to support when phone is shaked +## "react-native-splash-screen": "^3.2.0" + +used to make splash screen during initial loading + +## "react-native-status-keycard": "^2.5.7" + +used for keycard + +## "react-native-svg": "9.7.1" + +used for svg icons, mostly collectibles are using svg +TODO: updating requires a pod update on iOS + +## "react-native-touch-id": "^4.4.1" + +used for touch-id identification + +## "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#fix/classnames-colision" + +used for browser + +## "react-navigation": "3.11.0" + +used for native navigation +fixed because even bugfix version upgrade causes runtime errors with current version of react-native + +## "web3-utils": "^1.2.1" + +used for some abi encoding primitives diff --git a/mobile_files/metro.config.js b/mobile_files/metro.config.js index d09cb67d5b..953d7fa16e 100644 --- a/mobile_files/metro.config.js +++ b/mobile_files/metro.config.js @@ -1,12 +1,11 @@ -const { getDefaultConfig } = require("metro-config"); - -module.exports = (async () => { - const { - resolver: { sourceExts, assetExts } - } = await getDefaultConfig(); - return { +/** + * Metro configuration for React Native + * https://github.com/facebook/react-native + * + * @format + */ +module.exports = { transformer: { - babelTransformerPath: require.resolve("react-native-svg-transformer"), getTransformOptions: async () => ({ transform: { experimentalImportSupport: false, @@ -14,9 +13,4 @@ module.exports = (async () => { }, }), }, - resolver: { - assetExts: assetExts.filter(ext => ext !== "svg"), - sourceExts: [...sourceExts, "svg"] - } - }; -})(); +}; diff --git a/mobile_files/package.json.orig b/mobile_files/package.json.orig index e423036ab7..f66fd7e8ff 100644 --- a/mobile_files/package.json.orig +++ b/mobile_files/package.json.orig @@ -7,15 +7,12 @@ }, "dependencies": { "@react-native-community/netinfo": "^3.2.1", - "@tradle/react-native-http": "^2.0.1", - "assert": "^1.5.0", - "asyncstorage-down": "^4.2.0", "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#v4.0.2-status", + "buffer": "^5.4.2", "chance": "^1.1.0", "create-react-class": "15.6.2", "emojilib": "^2.4.0", "eth-phishing-detect": "^1.1.13", - "events": "^1.1.1", "hi-base32": "^0.5.0", "i18n-js": "^3.3.0", "identicon.js": "git+https://github.com/status-im/identicon.js.git#v1.2.1-status", @@ -31,22 +28,17 @@ "react-native-firebase": "5.1.1", "react-native-fs": "^2.14.1", "react-native-gesture-handler": "1.3.0", - "react-native-http-bridge": "^0.6.1", "react-native-image-crop-picker": "^0.18.2", "react-native-image-resizer": "git+https://github.com/status-im/react-native-image-resizer.git#1.0.0-1-status", "react-native-keychain": "git+https://github.com/status-im/react-native-keychain.git#v.3.0.0-status", "react-native-languages": "^3.0.2", "react-native-mail": "git+https://github.com/status-im/react-native-mail.git#v3.0.8_status", "react-native-navigation-twopane": "git+https://github.com/status-im/react-native-navigation-twopane.git#v0.0.2-status", - "react-native-randombytes": "^3.5.3", - "react-native-safe-area-view": "^0.14.7", "react-native-screens": "1.0.0-alpha.22", - "react-native-securerandom": "git+https://github.com/status-im/react-native-securerandom.git#0.1.1-2", "react-native-shake": "^3.3.1", "react-native-splash-screen": "^3.2.0", "react-native-status-keycard": "^2.5.7", - "react-native-svg": "^9.8.4", - "react-native-svg-transformer": "^0.12.1", + "react-native-svg": "9.7.1", "react-native-touch-id": "^4.4.1", "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#fix/classnames-colision", "react-navigation": "3.11.0", diff --git a/mobile_files/yarn.lock b/mobile_files/yarn.lock index eeb17a2bb7..6c0a1ace31 100644 --- a/mobile_files/yarn.lock +++ b/mobile_files/yarn.lock @@ -9,7 +9,7 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@^7.0.0", "@babel/core@^7.4.5": +"@babel/core@^7.0.0": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz#17b2686ef0d6bc58f963dddd68ab669755582c30" integrity sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg== @@ -896,99 +896,6 @@ react-native-safe-area-view "^0.14.1" react-native-screens "^1.0.0 || ^1.0.0-alpha" -"@svgr/babel-plugin-add-jsx-attribute@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz#dadcb6218503532d6884b210e7f3c502caaa44b1" - integrity sha512-j7KnilGyZzYr/jhcrSYS3FGWMZVaqyCG0vzMCwzvei0coIkczuYMcniK07nI0aHJINciujjH11T72ICW5eL5Ig== - -"@svgr/babel-plugin-remove-jsx-attribute@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-4.2.0.tgz#297550b9a8c0c7337bea12bdfc8a80bb66f85abc" - integrity sha512-3XHLtJ+HbRCH4n28S7y/yZoEQnRpl0tvTZQsHqvaeNXPra+6vE5tbRliH3ox1yZYPCxrlqaJT/Mg+75GpDKlvQ== - -"@svgr/babel-plugin-remove-jsx-empty-expression@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-4.2.0.tgz#c196302f3e68eab6a05e98af9ca8570bc13131c7" - integrity sha512-yTr2iLdf6oEuUE9MsRdvt0NmdpMBAkgK8Bjhl6epb+eQWk6abBaX3d65UZ3E3FWaOwePyUgNyNCMVG61gGCQ7w== - -"@svgr/babel-plugin-replace-jsx-attribute-value@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-4.2.0.tgz#310ec0775de808a6a2e4fd4268c245fd734c1165" - integrity sha512-U9m870Kqm0ko8beHawRXLGLvSi/ZMrl89gJ5BNcT452fAjtF2p4uRzXkdzvGJJJYBgx7BmqlDjBN/eCp5AAX2w== - -"@svgr/babel-plugin-svg-dynamic-title@^4.3.1": - version "4.3.1" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.1.tgz#646c2f5b5770c2fe318d6e51492344c3d62ddb63" - integrity sha512-p6z6JJroP989jHWcuraeWpzdejehTmLUpyC9smhTBWyPN0VVGe2phbYxpPTV7Vh8XzmFrcG55idrnfWn/2oQEw== - -"@svgr/babel-plugin-svg-em-dimensions@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-4.2.0.tgz#9a94791c9a288108d20a9d2cc64cac820f141391" - integrity sha512-C0Uy+BHolCHGOZ8Dnr1zXy/KgpBOkEUYY9kI/HseHVPeMbluaX3CijJr7D4C5uR8zrc1T64nnq/k63ydQuGt4w== - -"@svgr/babel-plugin-transform-react-native-svg@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-4.2.0.tgz#151487322843359a1ca86b21a3815fd21a88b717" - integrity sha512-7YvynOpZDpCOUoIVlaaOUU87J4Z6RdD6spYN4eUb5tfPoKGSF9OG2NuhgYnq4jSkAxcpMaXWPf1cePkzmqTPNw== - -"@svgr/babel-plugin-transform-svg-component@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-4.2.0.tgz#5f1e2f886b2c85c67e76da42f0f6be1b1767b697" - integrity sha512-hYfYuZhQPCBVotABsXKSCfel2slf/yvJY8heTVX1PCTaq/IgASq1IyxPPKJ0chWREEKewIU/JMSsIGBtK1KKxw== - -"@svgr/babel-preset@^4.3.1": - version "4.3.1" - resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-4.3.1.tgz#62ffcb85d756580e8ce608e9d2ac3b9063be9e28" - integrity sha512-rPFKLmyhlh6oeBv3j2vEAj2nd2QbWqpoJLKzBLjwQVt+d9aeXajVaPNEqrES2spjXKR4OxfgSs7U0NtmAEkr0Q== - dependencies: - "@svgr/babel-plugin-add-jsx-attribute" "^4.2.0" - "@svgr/babel-plugin-remove-jsx-attribute" "^4.2.0" - "@svgr/babel-plugin-remove-jsx-empty-expression" "^4.2.0" - "@svgr/babel-plugin-replace-jsx-attribute-value" "^4.2.0" - "@svgr/babel-plugin-svg-dynamic-title" "^4.3.1" - "@svgr/babel-plugin-svg-em-dimensions" "^4.2.0" - "@svgr/babel-plugin-transform-react-native-svg" "^4.2.0" - "@svgr/babel-plugin-transform-svg-component" "^4.2.0" - -"@svgr/core@^4.1.0": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@svgr/core/-/core-4.3.2.tgz#939c89be670ad79b762f4c063f213f0e02535f2e" - integrity sha512-N+tP5CLFd1hP9RpO83QJPZY3NL8AtrdqNbuhRgBkjE/49RnMrrRsFm1wY8pueUfAGvzn6tSXUq29o6ah8RuR5w== - dependencies: - "@svgr/plugin-jsx" "^4.3.2" - camelcase "^5.3.1" - cosmiconfig "^5.2.1" - -"@svgr/hast-util-to-babel-ast@^4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-4.3.2.tgz#1d5a082f7b929ef8f1f578950238f630e14532b8" - integrity sha512-JioXclZGhFIDL3ddn4Kiq8qEqYM2PyDKV0aYno8+IXTLuYt6TOgHUbUAAFvqtb0Xn37NwP0BTHglejFoYr8RZg== - dependencies: - "@babel/types" "^7.4.4" - -"@svgr/plugin-jsx@^4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-4.3.2.tgz#ce9ddafc8cdd74da884c9f7af014afcf37f93d3c" - integrity sha512-+1GW32RvmNmCsOkMoclA/TppNjHPLMnNZG3/Ecscxawp051XJ2MkO09Hn11VcotdC2EPrDfT8pELGRo+kbZ1Eg== - dependencies: - "@babel/core" "^7.4.5" - "@svgr/babel-preset" "^4.3.1" - "@svgr/hast-util-to-babel-ast" "^4.3.2" - svg-parser "^2.0.0" - -"@tradle/react-native-http@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@tradle/react-native-http/-/react-native-http-2.0.1.tgz#af19e240e1e580bfa249563924d1be472686f48b" - integrity sha1-rxniQOHlgL+iSVY5JNG+RyaG9Is= - dependencies: - Base64 "~0.2.0" - inherits "~2.0.1" - -Base64@~0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/Base64/-/Base64-0.2.1.tgz#ba3a4230708e186705065e66babdd4c35cf60028" - integrity sha1-ujpCMHCOGGcFBl5mur3Uw1z2ACg= - abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -999,13 +906,6 @@ absolute-path@^0.0.0: resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7" integrity sha1-p4di+9rftSl76ZsV01p4Wy8JW/c= -abstract-leveldown@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-2.6.1.tgz#f9014a5669b746418e145168dea49a044ae15900" - integrity sha1-+QFKVmm3RkGOFFFo3qSaBErhWQA= - dependencies: - xtend "~4.0.0" - accepts@~1.3.5, accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -1134,11 +1034,6 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -argsarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/argsarray/-/argsarray-0.0.1.tgz#6e7207b4ecdb39b0af88303fa5ae22bda8df61cb" - integrity sha1-bnIHtOzbObCviDA/pa4ivajfYcs= - aria-query@^0.7.0: version "0.7.1" resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.7.1.tgz#26cbb5aff64144b0a825be1846e0b16cfa00b11e" @@ -1242,14 +1137,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= -assert@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" - integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== - dependencies: - object-assign "^4.1.1" - util "0.10.3" - assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" @@ -1277,17 +1164,6 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= -asyncstorage-down@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/asyncstorage-down/-/asyncstorage-down-4.2.0.tgz#6d126f42e6e4db0a25113e118ff618f2d4534046" - integrity sha512-xTljBjicpnxsoA7yEs6duXFXWEZC0V1Q/PeKcUM7Cd2k2W1XPGfyBY1kPXBxTqR++u6ZuDa5egnU8/E/WkJv4Q== - dependencies: - abstract-leveldown "2.6.1" - argsarray "0.0.1" - d64 "^1.0.0" - ltgt "^2.1.3" - tiny-queue "0.2.0" - atob@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" @@ -1365,7 +1241,7 @@ base-64@^0.1.0: resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb" integrity sha1-eAqZyE59YAJgNhURxId2E78k9rs= -base64-js@*, base64-js@^1.0.2, base64-js@^1.1.2, base64-js@^1.2.3: +base64-js@^1.0.2, base64-js@^1.1.2, base64-js@^1.2.3: version "1.3.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== @@ -1499,14 +1375,13 @@ buffer-to-arraybuffer@^0.0.5: resolved "https://registry.yarnpkg.com/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz#6064a40fa76eb43c723aba9ef8f6e1216d10511a" integrity sha1-YGSkD6dutDxyOrqe+PbhIW0QURo= -buffer@^4.9.1: - version "4.9.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" - integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg= +buffer@^5.4.2: + version "5.4.2" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.4.2.tgz#2012872776206182480eccb2c0fba5f672a2efef" + integrity sha512-iy9koArjAFCzGnx3ZvNA6Z0clIbbFgbdWQ0mKD3hO0krOrZh8UgA6qMKcZvwLJxS+D6iVR76+5/pV56yMNYTag== dependencies: base64-js "^1.0.2" ieee754 "^1.1.4" - isarray "^1.0.0" bytes@3.0.0: version "3.0.0" @@ -1562,7 +1437,7 @@ camelcase@^4.1.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= -camelcase@^5.0.0, camelcase@^5.3.1: +camelcase@^5.0.0: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== @@ -1798,7 +1673,7 @@ core-util-is@1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cosmiconfig@^5.0.5, cosmiconfig@^5.2.1: +cosmiconfig@^5.0.5: version "5.2.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== @@ -1877,11 +1752,6 @@ cross-spawn@^6.0.0: shebang-command "^1.2.0" which "^1.2.9" -d64@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/d64/-/d64-1.0.0.tgz#4002a87e850cbfc9f9d9706b60fca613a3336e90" - integrity sha1-QAKofoUMv8n52XBrYPymE6MzbpA= - damerau-levenshtein@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz#780cf7144eb2e8dbd1c3bb83ae31100ccc31a414" @@ -2205,11 +2075,6 @@ eventemitter3@^3.0.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== -events@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" - integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= - exec-sh@^0.2.0: version "0.2.2" resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36" @@ -2922,16 +2787,11 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= - ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -3185,7 +3045,7 @@ isarray@0.0.1: resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= -isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: +isarray@1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -3560,11 +3420,6 @@ lru-cache@^4.0.1: pseudomap "^1.0.2" yallist "^2.1.2" -ltgt@^2.1.3: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5" - integrity sha1-81ypHEk/e3PaDgdJUwTxezH4fuU= - make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -4880,11 +4735,6 @@ react-native-gesture-handler@1.3.0: invariant "^2.2.2" prop-types "^15.5.10" -react-native-http-bridge@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/react-native-http-bridge/-/react-native-http-bridge-0.6.1.tgz#1b85688174870e9b009692e1a6cdc5f5396c5ca4" - integrity sha512-XnPVdaYkKIC8bRGmADVLhgDO0Evnya3rOExVEzxk6pBJjNUewWljkGHt//OTpb4t7Te6oDqQAwa+gfVtzhRU1A== - react-native-image-crop-picker@^0.18.2: version "0.18.2" resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.18.2.tgz#f0cfbe4227449d84f6d5885ef37462edf6920090" @@ -4911,15 +4761,7 @@ react-native-languages@^3.0.2: version "0.0.2" resolved "git+https://github.com/status-im/react-native-navigation-twopane.git#04ed5fddfb46a6a3ee30776987acb4d3b11c27d4" -react-native-randombytes@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/react-native-randombytes/-/react-native-randombytes-3.5.3.tgz#b3bdcd11473cce106551a586244b98855e443cd1" - integrity sha512-n/7QwMrRJxHr+/3mt2KxqqacGylM+ssW+FfBTgXGzvwq5KzSohooEWf6Z6MTSByuJ/izP9VbSPtwomPwzvupKQ== - dependencies: - buffer "^4.9.1" - sjcl "^1.0.3" - -react-native-safe-area-view@^0.14.1, react-native-safe-area-view@^0.14.7: +react-native-safe-area-view@^0.14.1: version "0.14.7" resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.7.tgz#e1dd1c4d25a90677df2c15347fdddb2306ba5971" integrity sha512-fmuBYpvKDJK33bimo4JXrK2BN2CGw7nof1y1LDRgzqv+FZ3eADSDGshprN8WeQqSZjQ20hJx1CiWk28Edg/v4Q== @@ -4938,12 +4780,6 @@ react-native-screens@1.0.0-alpha.22: dependencies: debounce "^1.2.0" -"react-native-securerandom@git+https://github.com/status-im/react-native-securerandom.git#0.1.1-2": - version "0.1.1" - resolved "git+https://github.com/status-im/react-native-securerandom.git#ff9f56fae93520c78503c10e24603d3853aece0f" - dependencies: - base64-js "*" - react-native-shake@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/react-native-shake/-/react-native-shake-3.3.1.tgz#e168827015db0cfb316f2bd428afe95f225fda6a" @@ -4961,18 +4797,10 @@ react-native-status-keycard@^2.5.7: resolved "https://registry.yarnpkg.com/react-native-status-keycard/-/react-native-status-keycard-2.5.11.tgz#ba7d6b417ca3de345b7da27997d799ece6de6b68" integrity sha512-yc1Jkr+mKJpyd8QRJuYFchzkZ8ANDSC2CPYVKJJN2i93RReft3o2cHAi+Sn5LxI5Ex5ZpLaEzdL5ezG2EWbrjA== -react-native-svg-transformer@^0.12.1: - version "0.12.1" - resolved "https://registry.yarnpkg.com/react-native-svg-transformer/-/react-native-svg-transformer-0.12.1.tgz#9546b65f5829e9f85c2951186a67e72e9a4c79ab" - integrity sha512-lau+hkPXFo40vUIUkp2nJCNeVJwsLxOx5qRvdUhuaSXGtvQbl+w+q3qs68Cy2Eqm+fvu1feWCp/OT30nW+yKpw== - dependencies: - "@svgr/core" "^4.1.0" - semver "^5.6.0" - -react-native-svg@^9.8.4: - version "9.8.4" - resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-9.8.4.tgz#6fd28198ae991b30cfbea10bb445b55870f0457c" - integrity sha512-s0kCURCQyupf9qL3ZPccZ43Hxkvmccf+tZ1/Tq2bAiORLNhVCI0gtI57zqqHsKk5PnTKmnqT8aTWfp5TzYgZWw== +react-native-svg@9.7.1: + version "9.7.1" + resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-9.7.1.tgz#a6d270cd51f8f238de7623338211debf4ff9cf5c" + integrity sha512-Yr54SyLPCdovLCJ08V7syJUe1iKrTYG9V5wB08z6lh/9FdC2R9CtBnMyz83GDLKfzUONqqH9nN1l+o61CgD3tg== react-native-tab-view@^1.2.0, react-native-tab-view@^1.4.1: version "1.4.1" @@ -5557,11 +5385,6 @@ simple-plist@^1.0.0: bplist-parser "0.1.1" plist "^3.0.1" -sjcl@^1.0.3: - version "1.0.8" - resolved "https://registry.yarnpkg.com/sjcl/-/sjcl-1.0.8.tgz#f2ec8d7dc1f0f21b069b8914a41a8f236b0e252a" - integrity sha512-LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ== - slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" @@ -5861,11 +5684,6 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" -svg-parser@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.2.tgz#d134cc396fa2681dc64f518330784e98bd801ec8" - integrity sha512-1gtApepKFweigFZj3sGO8KT8LvVZK8io146EzXrpVuWCDAbISz/yMucco3hWTkpZNoPabM+dnMOpy6Swue68Zg== - symbol-observable@^1.0.1: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -5930,11 +5748,6 @@ timed-out@^4.0.1: resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= -tiny-queue@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.0.tgz#c49fcb5c87555be1b4a5df7eb87101d5b78bc9dc" - integrity sha1-xJ/LXIdVW+G0pd9+uHEB1beLydw= - tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -6141,13 +5954,6 @@ util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= -util@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= - dependencies: - inherits "2.0.1" - utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" @@ -6359,7 +6165,7 @@ xpipe@^1.0.5: resolved "https://registry.yarnpkg.com/xpipe/-/xpipe-1.0.5.tgz#8dd8bf45fc3f7f55f0e054b878f43a62614dafdf" integrity sha1-jdi/Rfw/f1Xw4FS4ePQ6YmFNr98= -xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== diff --git a/react-native/src/desktop/status_im/react_native/js_dependencies.cljs b/react-native/src/desktop/status_im/react_native/js_dependencies.cljs index f463aefad0..a837a56c39 100644 --- a/react-native/src/desktop/status_im/react_native/js_dependencies.cljs +++ b/react-native/src/desktop/status_im/react_native/js_dependencies.cljs @@ -2,15 +2,12 @@ (def config (js/require "react-native-config")) (def fs (js/require "react-native-fs")) -(def http-bridge (js/require "react-native-http-bridge")) (def keychain (js/require "react-native-keychain")) (def qr-code (js/require "qrcode")) (def react-native (js/require "react-native")) (def webview-bridge (js/require "react-native-webview-bridge")) (def webview #js {:WebView #js {}}) (def EventEmmiter #js {}) -(def securerandom (js/require "react-native-securerandom")) -(def secure-random (.-generateSecureRandom securerandom)) (def fetch-polyfill (js/require "react-native-fetch-polyfill")) (def fetch (.-default fetch-polyfill)) (def i18n (js/require "i18n-js")) diff --git a/react-native/src/mobile/status_im/react_native/js_dependencies.cljs b/react-native/src/mobile/status_im/react_native/js_dependencies.cljs index ce72352714..2aa63c891f 100644 --- a/react-native/src/mobile/status_im/react_native/js_dependencies.cljs +++ b/react-native/src/mobile/status_im/react_native/js_dependencies.cljs @@ -2,7 +2,6 @@ (def config (js/require "react-native-config")) (def fs (js/require "react-native-fs")) -(def http-bridge (js/require "react-native-http-bridge")) (def keychain (js/require "react-native-keychain")) (def qr-code (js/require "qrcode")) (def react-native (js/require "react-native")) @@ -12,8 +11,6 @@ (def touchid (.-default touchid-class)) ;(defn webview [] (js/require "react-native-webview")) (def EventEmmiter (js/require "react-native/Libraries/vendor/emitter/EventEmitter")) -(def securerandom (js/require "react-native-securerandom")) -(def secure-random (.-generateSecureRandom securerandom)) (def fetch-polyfill (js/require "react-native-fetch-polyfill")) (def fetch (.-default fetch-polyfill)) (def i18n (js/require "i18n-js")) diff --git a/src/status_im/android/core.cljs b/src/status_im/android/core.cljs index ac6bbc8b5d..0ad2145fa8 100644 --- a/src/status_im/android/core.cljs +++ b/src/status_im/android/core.cljs @@ -43,7 +43,7 @@ (dispatch [:set :keyboard-height 0])))) (.hide react/splash-screen) ;; TODO Temporarily comment away due to current bug https://github.com/kmagiera/react-native-screens/issues/54 - ;(.useScreens rn-dependencies/react-native-screens) + ;(.useScreens rn-dependencies/react-native-screens) (.addEventListener react/app-state "change" app-state-change-handler) (.addEventListener rn-dependencies/react-native-languages "change" on-languages-change) (.addEventListener rn-dependencies/react-native-shake @@ -52,7 +52,6 @@ (dispatch [:set-initial-props (reagent/props this)])) :component-will-unmount (fn [] - (.stop react/http-bridge) (.removeEventListener react/app-state "change" app-state-change-handler) (.removeEventListener rn-dependencies/react-native-languages "change" on-languages-change)) :display-name "root" diff --git a/src/status_im/desktop/core.cljs b/src/status_im/desktop/core.cljs index e751f53a51..4ed9a36fa8 100644 --- a/src/status_im/desktop/core.cljs +++ b/src/status_im/desktop/core.cljs @@ -27,7 +27,6 @@ (re-frame/dispatch [:set-initial-props (reagent/props this)])) :component-will-unmount (fn [] - (.stop react/http-bridge) (.removeEventListener react/app-state "change" app-state-change-handler)) :display-name "root" :reagent-render views/main}) diff --git a/src/status_im/ios/core.cljs b/src/status_im/ios/core.cljs index 4853c6e1c0..dd561c1f1d 100644 --- a/src/status_im/ios/core.cljs +++ b/src/status_im/ios/core.cljs @@ -47,7 +47,6 @@ (dispatch [:set-initial-props (reagent/props this)])) :component-will-unmount (fn [] - (.stop react/http-bridge) (.removeEventListener react/app-state "change" app-state-change-handler) (.removeEventListener rn-dependencies/react-native-languages "change" on-languages-change)) :display-name "root" diff --git a/test/cljs/status_im/react_native/js_dependencies.cljs b/test/cljs/status_im/react_native/js_dependencies.cljs index 02b0a03c15..aadbe158b3 100644 --- a/test/cljs/status_im/react_native/js_dependencies.cljs +++ b/test/cljs/status_im/react_native/js_dependencies.cljs @@ -7,7 +7,6 @@ (def dismiss-keyboard #js {}) (def emoji-picker #js {:default #js {}}) (def fs #js {}) -(def http-bridge #js {}) (def i18n #js {:locale "en"}) (def react-native-languages #js {:language "en", :addEventListener (fn []), :removeEventListener (fn [])}) (def image-crop-picker #js {}) @@ -45,7 +44,6 @@ :clearInterval js/clearInterval}) (def keychain #js {:setGenericPassword (constantly (.resolve js/Promise true))}) -(def secure-random #(.resolve js/Promise (clj->js (range 0 %)))) (def react-navigation #js {:NavigationActions #js {}}) (def desktop-menu #js {}) (def desktop-config #js {})