diff --git a/react/package-lock.json b/react/package-lock.json
index 692211bbc..ecb0d6773 100644
--- a/react/package-lock.json
+++ b/react/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "AgamaGUI",
-  "version": "0.3.13",
+  "version": "0.4.0h-beta",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -125,90 +125,6 @@
       "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
       "dev": true
     },
-    "agama-wallet-lib": {
-      "version": "git+https://github.com/VerusCoin/agama-wallet-lib.git#69c54778ceb948bcbe917afbd87b058f2a7b59dd",
-      "requires": {
-        "bigi": "1.4.2",
-        "bip39": "2.5.0",
-        "bitcoinforksjs-lib": "git://github.com/SuperNETorg/bitcoinjs-lib.git#70127e736cea5535ffdc4b9324a4765b2f8e87fe",
-        "bitcoinjs-lib": "git://github.com/SuperNETorg/bitcoinjs-lib.git#b5cc78cde0265ba6606b2c9c33e0158489c0fa4a",
-        "bitcoinjs-lib-pos": "git://github.com/KomodoPlatform/bitcoinjs-lib-pos.git#739004e13f9e2f09adf8106d474660d9e89264f0",
-        "bitcoinjs-lib-zcash": "git://github.com/pbca26/bitcoinjs-lib.git#d5304080812c66c4ad17abca9bdcb8efbd0b6bc6",
-        "bluebird": "3.5.1",
-        "buffer-reverse": "1.0.1",
-        "coinselect": "github:bitcoinjs/coinselect#6d8a1c0b223b5c7b083cd77bace6a1da548d0244",
-        "iocane": "1.0.0",
-        "js-sha256": "0.7.1",
-        "nodejs-aes256": "1.0.1",
-        "passwd-strength": "git://github.com/pbca26/passwd-strength.git#3890ea7d0c5efb2ebaae0c3e93770f62ae7ec4c5",
-        "sha256": "0.2.0",
-        "tx-decoder": "git://github.com/pbca26/tx-decoder.git#bc6f0b5b385cea1ff1717ef8107915ccf4aed07b",
-        "wif": "2.0.6"
-      },
-      "dependencies": {
-        "bech32": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.3.tgz",
-          "integrity": "sha512-yuVFUvrNcoJi0sv5phmqc6P+Fl1HjRDRNOOkHY2X/3LBy2bIGNSFx4fZ95HMaXHupuS7cZR15AsvtmCIF4UEyg=="
-        },
-        "bitcoinjs-lib": {
-          "version": "git://github.com/SuperNETorg/bitcoinjs-lib.git#b5cc78cde0265ba6606b2c9c33e0158489c0fa4a",
-          "requires": {
-            "bech32": "1.1.3",
-            "bigi": "1.4.2",
-            "bip66": "1.1.5",
-            "bitcoin-ops": "1.4.1",
-            "bs58check": "2.1.1",
-            "create-hash": "1.2.0",
-            "create-hmac": "1.1.7",
-            "ecurve": "1.0.6",
-            "merkle-lib": "2.0.10",
-            "pushdata-bitcoin": "1.0.1",
-            "randombytes": "2.0.6",
-            "safe-buffer": "5.1.2",
-            "typeforce": "1.12.0",
-            "varuint-bitcoin": "1.1.0",
-            "wif": "2.0.6"
-          }
-        },
-        "bitcoinjs-lib-zcash": {
-          "version": "git://github.com/pbca26/bitcoinjs-lib.git#d5304080812c66c4ad17abca9bdcb8efbd0b6bc6",
-          "requires": {
-            "bigi": "1.4.2",
-            "bip66": "1.1.5",
-            "bitcoin-ops": "1.4.1",
-            "bs58check": "2.1.1",
-            "create-hash": "1.2.0",
-            "create-hmac": "1.1.7",
-            "ecurve": "1.0.6",
-            "merkle-lib": "1.0.0",
-            "pushdata-bitcoin": "1.0.1",
-            "randombytes": "2.0.6",
-            "typeforce": "1.12.0",
-            "varuint-bitcoin": "1.1.0",
-            "wif": "2.0.6"
-          },
-          "dependencies": {
-            "merkle-lib": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/merkle-lib/-/merkle-lib-1.0.0.tgz",
-              "integrity": "sha1-vQiLLHsQJjORA6DzQprgkCLPslw="
-            }
-          }
-        },
-        "coinselect": {
-          "version": "github:bitcoinjs/coinselect#6d8a1c0b223b5c7b083cd77bace6a1da548d0244"
-        },
-        "tx-decoder": {
-          "version": "git://github.com/pbca26/tx-decoder.git#bc6f0b5b385cea1ff1717ef8107915ccf4aed07b",
-          "requires": {
-            "safe-buffer": "5.1.2",
-            "typeforce": "1.12.0",
-            "varuint-bitcoin": "1.1.0"
-          }
-        }
-      }
-    },
     "agent-base": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
@@ -1782,11 +1698,6 @@
         "tweetnacl": "0.14.5"
       }
     },
-    "bech32": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/bech32/-/bech32-0.0.3.tgz",
-      "integrity": "sha512-O+K1w8P/aAOLcYwwQ4sbiPYZ51ZIW95lnS4/6nE8Aib/z+OOddQIIPdu2qi94qGDp4HhYy/wJotttXKkak1lXg=="
-    },
     "better-assert": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
@@ -1822,18 +1733,6 @@
       "resolved": "https://registry.npmjs.org/binstring/-/binstring-0.2.1.tgz",
       "integrity": "sha1-ihdNMB9tVO/aVQ3Zi7TLUk6s110="
     },
-    "bip39": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/bip39/-/bip39-2.5.0.tgz",
-      "integrity": "sha512-xwIx/8JKoT2+IPJpFEfXoWdYwP7UVAoUxxLNfGCfVowaJE7yg1Y5B1BVPqlUNsBq5/nGwmFkwRJ8xDW4sX8OdA==",
-      "requires": {
-        "create-hash": "1.2.0",
-        "pbkdf2": "3.0.16",
-        "randombytes": "2.0.6",
-        "safe-buffer": "5.1.2",
-        "unorm": "1.4.1"
-      }
-    },
     "bip66": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
@@ -1879,26 +1778,6 @@
         }
       }
     },
-    "bitcoinforksjs-lib": {
-      "version": "git://github.com/SuperNETorg/bitcoinjs-lib.git#70127e736cea5535ffdc4b9324a4765b2f8e87fe",
-      "requires": {
-        "bech32": "0.0.3",
-        "bigi": "1.4.2",
-        "bip66": "1.1.5",
-        "bitcoin-ops": "1.4.1",
-        "bs58check": "2.1.1",
-        "create-hash": "1.2.0",
-        "create-hmac": "1.1.7",
-        "ecurve": "1.0.6",
-        "merkle-lib": "2.0.10",
-        "pushdata-bitcoin": "1.0.1",
-        "randombytes": "2.0.6",
-        "safe-buffer": "5.1.2",
-        "typeforce": "1.12.0",
-        "varuint-bitcoin": "1.1.0",
-        "wif": "2.0.6"
-      }
-    },
     "bitcoinjs-lib": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-3.3.2.tgz",
@@ -1928,42 +1807,6 @@
         }
       }
     },
-    "bitcoinjs-lib-pos": {
-      "version": "git://github.com/KomodoPlatform/bitcoinjs-lib-pos.git#739004e13f9e2f09adf8106d474660d9e89264f0",
-      "requires": {
-        "bigi": "1.4.2",
-        "bs58check": "1.3.4",
-        "create-hash": "1.2.0",
-        "create-hmac": "1.1.7",
-        "ecurve": "1.0.6",
-        "randombytes": "2.0.6",
-        "typeforce": "1.12.0"
-      },
-      "dependencies": {
-        "base-x": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/base-x/-/base-x-1.1.0.tgz",
-          "integrity": "sha1-QtPXF0dPnqAiB/bRqh9CaRPut6w="
-        },
-        "bs58": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/bs58/-/bs58-3.1.0.tgz",
-          "integrity": "sha1-1MJjiL9IBMrHFBQbGUWqR+XrJI4=",
-          "requires": {
-            "base-x": "1.1.0"
-          }
-        },
-        "bs58check": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-1.3.4.tgz",
-          "integrity": "sha1-xSVABzdJEXcU+gQsMEfrj5FRy/g=",
-          "requires": {
-            "bs58": "3.1.0",
-            "create-hash": "1.2.0"
-          }
-        }
-      }
-    },
     "bitcoinjs-lib-zcash": {
       "version": "3.4.2",
       "resolved": "https://registry.npmjs.org/bitcoinjs-lib-zcash/-/bitcoinjs-lib-zcash-3.4.2.tgz",
@@ -2271,11 +2114,6 @@
       "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
       "dev": true
     },
-    "buffer-reverse": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-reverse/-/buffer-reverse-1.0.1.tgz",
-      "integrity": "sha1-SSg8jvpvkBvAH6MwTQYCeXGuL2A="
-    },
     "buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
@@ -4892,7 +4730,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4913,12 +4752,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "1.0.0",
             "concat-map": "0.0.1"
@@ -4933,17 +4774,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5060,7 +4904,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5072,6 +4917,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "1.0.1"
           }
@@ -5086,6 +4932,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "1.1.11"
           }
@@ -5093,12 +4940,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "5.1.1",
             "yallist": "3.0.2"
@@ -5117,6 +4966,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5197,7 +5047,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5209,6 +5060,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1.0.2"
           }
@@ -5294,7 +5146,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5330,6 +5183,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "1.1.0",
             "is-fullwidth-code-point": "1.0.0",
@@ -5349,6 +5203,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "2.1.1"
           }
@@ -5392,12 +5247,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -6299,14 +6156,6 @@
       "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
       "dev": true
     },
-    "iocane": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/iocane/-/iocane-1.0.0.tgz",
-      "integrity": "sha512-oBYOD5ayL475W95H/vW2Lqvb6s1ZMPdBRtf5ETZ/cBfUmvdSYJ0si6wVGFzJcPTIFaQfMmruNi7hgJJaC9QkMw==",
-      "requires": {
-        "pbkdf2": "3.0.16"
-      }
-    },
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -7441,11 +7290,6 @@
         "nopt": "3.0.6"
       }
     },
-    "js-sha256": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.7.1.tgz",
-      "integrity": "sha512-h8ClGdLqWo3y1PTmcd9aVExTbQouLVLsVigxYSN+rsmlCEX0TlQ0Xkbu4r2OIF+U29e7k1O0NxhtRRd0sJgAjg=="
-    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -7577,7 +7421,8 @@
       }
     },
     "jsqr": {
-      "version": "git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b"
+      "version": "git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b",
+      "from": "jsqr@git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b"
     },
     "jsx-ast-utils": {
       "version": "1.4.1",
@@ -8341,11 +8186,6 @@
         "true-case-path": "1.0.2"
       }
     },
-    "nodejs-aes256": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/nodejs-aes256/-/nodejs-aes256-1.0.1.tgz",
-      "integrity": "sha1-u2jLPzWRwoiMGhNulmfMGo7hVEg="
-    },
     "nopt": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -8774,9 +8614,6 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
-    "passwd-strength": {
-      "version": "git://github.com/pbca26/passwd-strength.git#3890ea7d0c5efb2ebaae0c3e93770f62ae7ec4c5"
-    },
     "path-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
@@ -8834,6 +8671,7 @@
       "version": "3.0.16",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
       "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
+      "dev": true,
       "requires": {
         "create-hash": "1.2.0",
         "create-hmac": "1.1.7",
@@ -9932,15 +9770,14 @@
       }
     },
     "react": {
-      "version": "15.6.2",
-      "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
-      "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
+      "version": "16.5.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.5.0.tgz",
+      "integrity": "sha512-nw/yB/L51kA9PsAy17T1JrzzGRk+BlFCJwFF7p+pwVxgqwPjYNeZEkkH7LXn9dmflolrYMXLWMTkQ77suKPTNQ==",
       "requires": {
-        "create-react-class": "15.6.3",
-        "fbjs": "0.8.17",
-        "loose-envify": "1.3.1",
-        "object-assign": "4.1.1",
-        "prop-types": "15.6.2"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "schedule": "^0.3.0"
       }
     },
     "react-deep-force-update": {
@@ -9949,19 +9786,16 @@
       "integrity": "sha1-vNMUeAJ7ZLMznxCJIatSC0MT3Cw="
     },
     "react-dom": {
-      "version": "15.6.2",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
-      "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
+      "version": "16.5.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.5.0.tgz",
+      "integrity": "sha512-qgsQdjFH54pQ1AGLCBKsqjPxib4Pnp+cOsNxGPlkHn5YnsSt43sBvHSif6FheY7NMMS6HPeSJOxXf6ECanjacA==",
       "requires": {
-        "fbjs": "0.8.17",
-        "loose-envify": "1.3.1",
-        "object-assign": "4.1.1",
-        "prop-types": "15.6.2"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "schedule": "^0.3.0"
       }
     },
-    "react-double-scrollbar": {
-      "version": "git://github.com/pbca26/react-double-scrollbar.git#58e9e585ae5105e87983b64c29d25d4a95c5a1eb"
-    },
     "react-hot-api": {
       "version": "0.4.7",
       "resolved": "https://registry.npmjs.org/react-hot-api/-/react-hot-api-0.4.7.tgz",
@@ -10008,7 +9842,7 @@
       "resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-1.2.1.tgz",
       "integrity": "sha512-GT8DBlExtbdJVZcYcKPfnROnr8ToCL9+yMT2fC6WSVFJRFwH5U+uM9qPnmmmcFfVjsvqHI3mpt/ALdmRsBRHuw==",
       "requires": {
-        "jsqr": "git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b",
+        "jsqr": "jsqr@git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b",
         "prop-types": "15.6.2",
         "webrtc-adapter": "2.1.0"
       }
@@ -10707,6 +10541,14 @@
       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
       "dev": true
     },
+    "schedule": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/schedule/-/schedule-0.3.0.tgz",
+      "integrity": "sha512-20+1KVo517sR7Nt+bYBN8a+bEJDKLPEx7Ohtts1kX05E4/HY53YUNuhfkVNItmWAnBYHcpG9vsd2/CJxG+aPCQ==",
+      "requires": {
+        "object-assign": "^4.1.1"
+      }
+    },
     "schema-utils": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
@@ -10911,15 +10753,6 @@
         "crypt": "0.0.2"
       }
     },
-    "sha256": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/sha256/-/sha256-0.2.0.tgz",
-      "integrity": "sha1-c6C0GNqrcDW/+G6EkeNjQS/CqwU=",
-      "requires": {
-        "convert-hex": "0.1.0",
-        "convert-string": "0.1.0"
-      }
-    },
     "shallowequal": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
@@ -11996,11 +11829,6 @@
       "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
       "dev": true
     },
-    "unorm": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",
-      "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA="
-    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
diff --git a/react/package.json b/react/package.json
index 45da702e9..1e8c96cca 100644
--- a/react/package.json
+++ b/react/package.json
@@ -43,8 +43,8 @@
     "file-loader": "^0.10.0",
     "qrcode.react": "^0.7.1",
     "rc-slider": "8.5.0",
-    "react": "^15.3.1",
-    "react-dom": "^15.3.1",
+    "react": "^16.5.0",
+    "react-dom": "^16.5.0",
     "react-double-scrollbar": "git+https://github.com/pbca26/react-double-scrollbar.git",
     "react-hot-loader": "^1.3.0",
     "react-qr-reader": "^1.1.3",