Merge branch 'develop' into upgrade-geth-1.9.5

ICONS.md

@@ -0,0 +1,24 @@
+# new icons
+
+## android
+1. copy files to corresponding directories at `/Users/romanvolosovskyi/clj/status-react/android/app/src/main/res` (one of `drawable-hdpi`, `drawable-mdpi`, `drawable-xhdpi`, `drawable-xxhdpi`, `drawable-xxxhdpi` for corresponding resolution)
+If you only have 3 pngs 1x, 2x and 3x put them in mdpi, xhdpi and xxhdpi 
+3. if necessary, rename file so that filename contains only lower case chars, and dashes instead of hyphens, e.g. `"Icon-Name.png"` should be renamed to `"icon_name.png"`.
+4. In the app `icon_name.png` still can be accessed as `icon-name`, so in order to use can add the next code:
+    ```clojure
+    ;; icon_name.png
+    [vector-icons/icon :icon-name {:color ...}] 
+    ```
+
+## ios
+1. open xcode (on macos run `open ios/StatusIm.xcworkspace` from project's root dir)
+2. go to `StatusIm/StatusIm/Images.xcassets` in xcode
+![](https://notes.status.im/uploads/upload_be25e49db97cb114ff4aa0c9d94422fa.png)
+3. add images there
+4.  if necessary, rename file so that filename contains only lower case chars, e.g. `"Icon-Name.png"` should be renamed to `"icon-name"`.
+5.  **IMPORTANT** there is no need to replace hyphens with dashes, and if you do so you will need to use names with dashes in both android and ios versions. So use dashes for android resources names and hyphens for ios.
+6.  And now `"icon-name"` can be added in app the same way as it was added for android version
+    ```clojure
+    ;; icon-name
+    [vector-icons/icon :icon-name {:color ...}] 
+    ```

desktop/js_files/package.json

@@ -6,6 +6,61 @@
     "start": "node node_modules/react-native/local-cli/cli.js start",
     "prepare": "patch-package"
   },
+  "dependencies": {
+    "assert": "^1.4.1",
+    "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#v4.0.2-status",
+    "buffer": "^3.6.0",
+    "chance": "^1.0.12",
+    "create-react-class": "^15.6.2",
+    "emojilib": "^2.2.9",
+    "eth-phishing-detect": "^1.1.13",
+    "events": "^1.1.1",
+    "google-breakpad": "git+https://github.com/status-im/google-breakpad.git#v0.9.0",
+    "hi-base32": "^0.5.0",
+    "i18n-js": "^3.1.0",
+    "identicon.js": "git+https://github.com/status-im/identicon.js.git#v1.2.1-status",
+    "metro": "^0.48.1",
+    "nfc-react-native": "git+https://github.com/status-im/nfc-react-native.git#v0.3.8-status",
+    "qrcode": "^1.4.1",
+    "react": "^16.6.1",
+    "react-dom": "^16.4.2",
+    "react-native": "git+https://github.com/status-im/react-native-desktop.git#v0.57.8_11",
+    "react-native-background-timer": "^2.0.0",
+    "react-native-camera": "^0.10.0",
+    "react-native-config": "git+https://github.com/status-im/react-native-config.git#v0.11.2-status",
+    "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-gesture-handler": "^1.3.0",
+    "react-native-image-crop-picker": "^0.18.1",
+    "react-native-image-resizer": "^1.0.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-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": "^3.11.0",
+    "status-conan": "git+https://github.com/status-im/status-conan.git#v1.0.0",
+    "web3-utils": "^1.0.0-beta.36"
+  },
+  "devDependencies": {
+    "@babel/core": "7.0.1",
+    "@babel/generator": "7.0.0",
+    "@babel/helper-builder-react-jsx": "7.0.0",
+    "@babel/plugin-transform-block-scoping": "7.0.0",
+    "@babel/preset-env": "7.1.0",
+    "@babel/register": "7.0.0",
+    "babel-preset-react-native": "^5.0.2",
+    "metro-react-native-babel-preset": "^0.45.6",
+    "coveralls": "^3.0.4",
+    "nyc": "^14.1.1",
+    "patch-package": "^5.1.1",
+    "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#v2.0.2-status"
+  },
+  "optionalDependencies": {
+    "appdmg": "^0.5.2"
+  },
   "desktopExternalModules": [
     "node_modules/react-native-languages/desktop",
     "node_modules/react-native-config/desktop",
@@ -41,61 +96,6 @@
     "../../../../../resources/fonts/Inter-Thin-BETA.otf",
     "../../../../../resources/fonts/Inter-ThinItalic-BETA.otf"
   ],
-  "dependencies": {
-    "assert": "1.4.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",
-    "chance": "1.0.12",
-    "create-react-class": "15.6.2",
-    "emojilib": "2.2.9",
-    "eth-phishing-detect": "1.1.13",
-    "events": "1.1.1",
-    "google-breakpad": "git+https://github.com/status-im/google-breakpad.git#v0.9.0",
-    "hi-base32": "0.5.0",
-    "i18n-js": "^3.1.0",
-    "identicon.js": "git+https://github.com/status-im/identicon.js.git#v1.2.1-status",
-    "metro": "^0.48.1",
-    "metro-react-native-babel-preset": "0.45.6",
-    "nfc-react-native": "git+https://github.com/status-im/nfc-react-native.git#v0.3.8-status",
-    "qrcode": "^1.4.1",
-    "react": "16.6.1",
-    "react-dom": "16.4.2",
-    "react-native": "git+https://github.com/status-im/react-native-desktop.git#v0.57.8_11",
-    "react-native-background-timer": "2.0.0",
-    "react-native-camera": "0.10.0",
-    "react-native-config": "git+https://github.com/status-im/react-native-config.git#v0.11.2-status",
-    "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-gesture-handler": "^1.3.0",
-    "react-native-image-crop-picker": "0.18.1",
-    "react-native-image-resizer": "1.0.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-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": "^3.11.0",
-    "status-conan": "git+https://github.com/status-im/status-conan.git#v1.0.0",
-    "web3-utils": "1.0.0-beta.36"
-  },
-  "devDependencies": {
-    "@babel/core": "7.0.1",
-    "@babel/generator": "7.0.0",
-    "@babel/helper-builder-react-jsx": "7.0.0",
-    "@babel/plugin-transform-block-scoping": "7.0.0",
-    "@babel/preset-env": "7.1.0",
-    "@babel/register": "7.0.0",
-    "coveralls": "^3.0.4",
-    "nyc": "^14.1.1",
-    "patch-package": "^5.1.1",
-    "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#v2.0.2-status"
-  },
-  "optionalDependencies": {
-    "appdmg": "^0.5.2"
-  },
   "desktopImages": [
     "../../../../../desktop/resources/add.png",
     "../../../../../desktop/resources/address.png",