From 636d6d29beaacde81b6b0119fa1265081f4af3f0 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 28 Apr 2021 16:42:49 +0300
Subject: [PATCH 01/10] Upgrade erdjs library

---
 react-delegationdashboard/package-lock.json   | 176 +++++++++---------
 react-delegationdashboard/package.json        |   2 +-
 .../components/ConfirmOnLedgerModal/index.tsx |   2 +-
 .../src/components/Layout/APRCalculation.ts   |  11 +-
 .../src/components/Layout/index.tsx           |  57 +++---
 .../LedgerTransactionStatus/index.tsx         |   4 +-
 .../src/components/Overview/Cards/index.tsx   |   2 +-
 .../src/components/Overview/Header/index.tsx  |   2 +-
 .../src/context/state.tsx                     |   6 +-
 .../src/contracts/ContractViews.ts            |  11 +-
 .../src/contracts/Delegation.tsx              |   4 +-
 .../src/helpers/contractDataDefinitions.ts    |  12 +-
 .../src/helpers/decodePem.tsx                 |   3 +-
 .../src/helpers/useDelegation.ts              |   4 +-
 .../src/pages/Dashboard/Delegation/index.tsx  |  16 +-
 .../Dashboard/PendingUndelegated/index.tsx    |  13 +-
 .../src/pages/Dashboard/index.tsx             |   2 +-
 .../src/pages/Home/Login/Wallet.tsx           |   2 +-
 .../src/pages/Ledger/AddressTable.tsx         |   3 +-
 .../src/pages/Ledger/index.tsx                |   2 +-
 .../src/pages/Owner/Nodes/AddNodeAction.tsx   |   2 +-
 .../src/pages/Owner/Nodes/NodeRow.tsx         |   8 +-
 .../Owner/Nodes/helpers/keysFunctions.ts      |  27 ++-
 .../src/pages/Owner/index.tsx                 |   2 +-
 24 files changed, 197 insertions(+), 176 deletions(-)

diff --git a/react-delegationdashboard/package-lock.json b/react-delegationdashboard/package-lock.json
index 36847a79..7c1aa618 100644
--- a/react-delegationdashboard/package-lock.json
+++ b/react-delegationdashboard/package-lock.json
@@ -1121,9 +1121,9 @@
       }
     },
     "@elrondnetwork/erdjs": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@elrondnetwork/erdjs/-/erdjs-3.1.3.tgz",
-      "integrity": "sha512-M3HSHaBSEYcLvth+ItY5+/7DG7N00nknIvNYs9ko4sgTeOCkwem3GSmzhOei1Zs+tmu26E8SsRwoUuPXhQDmGw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@elrondnetwork/erdjs/-/erdjs-4.0.3.tgz",
+      "integrity": "sha512-M7jqzvKWYw8EUWgcSrxYcfKQ1HoMWjHnmRqRalCDZK3F+dNYJg1vpFJfuA+sRle73mW4FAqNO6uU4jHiGo1yrg==",
       "requires": {
         "@babel/runtime": "^7.11.2",
         "@elrondnetwork/bls-wasm": "^0.3.3",
@@ -2014,14 +2014,14 @@
       }
     },
     "@ledgerhq/devices": {
-      "version": "5.46.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-5.46.0.tgz",
-      "integrity": "sha512-bQ9YVR0xocVv8sXDiKMabXauLpn870Su71RwumuG9z4o7f/8s710/5NEh7K11mmNJ7ztJsgDeqXq7ai2ZqilUw==",
-      "requires": {
-        "@ledgerhq/errors": "^5.46.0",
-        "@ledgerhq/logs": "^5.46.0",
-        "rxjs": "^6.6.6",
-        "semver": "^7.3.4"
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-5.50.0.tgz",
+      "integrity": "sha512-VU3i48egHwUSHqNPKa8dNXLxD6gvmPKbKkp2pGL8tNNGXT44iHWplEAQy7et7+Fa48Sh7G2WPBvCbQg9K/SeCw==",
+      "requires": {
+        "@ledgerhq/errors": "^5.50.0",
+        "@ledgerhq/logs": "^5.50.0",
+        "rxjs": "^6.6.7",
+        "semver": "^7.3.5"
       },
       "dependencies": {
         "semver": {
@@ -2035,17 +2035,17 @@
       }
     },
     "@ledgerhq/errors": {
-      "version": "5.46.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-5.46.0.tgz",
-      "integrity": "sha512-1/q/Tqv+aznX/rO3kdpg3Hv7O3xv68dWHkcfai8BZGTdTIwh6vdguFsdUNJ7eiNxEMKNA9gU+p78ZS/PDzoitQ=="
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-5.50.0.tgz",
+      "integrity": "sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow=="
     },
     "@ledgerhq/hw-transport": {
-      "version": "5.46.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-5.46.0.tgz",
-      "integrity": "sha512-iROB4eowxR7Bg67MEH+OlIsfN+UIjNLULr+A74gEFtMpHB3jvVc/aeq2gezv4fIueQQWV9X5IgNsxkPBI0vgtw==",
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-5.50.0.tgz",
+      "integrity": "sha512-VlcVGgp+Ae4hrUFzSroPJS4i7iBWEYVat91pCl8LyrN+xD8sjamHje69JCdDYY+Cb5++0pbSZt3FGiV0ml3xGA==",
       "requires": {
-        "@ledgerhq/devices": "^5.46.0",
-        "@ledgerhq/errors": "^5.46.0",
+        "@ledgerhq/devices": "^5.50.0",
+        "@ledgerhq/errors": "^5.50.0",
         "events": "^3.3.0"
       },
       "dependencies": {
@@ -2057,18 +2057,18 @@
       }
     },
     "@ledgerhq/hw-transport-node-hid": {
-      "version": "5.46.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-5.46.0.tgz",
-      "integrity": "sha512-bIQbs4Km4xmfaMZNDMxKiq+FdNOhO2QdBGnd+Vev9D79dpBk4+H9Xmzqw+r6eZEAah8d7Pbn8zbY5WabkxNMvQ==",
-      "requires": {
-        "@ledgerhq/devices": "^5.46.0",
-        "@ledgerhq/errors": "^5.46.0",
-        "@ledgerhq/hw-transport": "^5.46.0",
-        "@ledgerhq/hw-transport-node-hid-noevents": "^5.46.0",
-        "@ledgerhq/logs": "^5.46.0",
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-5.50.0.tgz",
+      "integrity": "sha512-dN9fFfCVHPIdyDF3cOC9JeFEBH/r7F25STDpY/hvmSmKCZIIUNgZ5Myvib+1W8CPhRFg1zEeamKO9bh8h865Sg==",
+      "requires": {
+        "@ledgerhq/devices": "^5.50.0",
+        "@ledgerhq/errors": "^5.50.0",
+        "@ledgerhq/hw-transport": "^5.50.0",
+        "@ledgerhq/hw-transport-node-hid-noevents": "^5.50.0",
+        "@ledgerhq/logs": "^5.50.0",
         "lodash": "^4.17.21",
         "node-hid": "2.1.1",
-        "usb": "^1.6.5"
+        "usb": "^1.7.0"
       },
       "dependencies": {
         "lodash": {
@@ -2079,14 +2079,14 @@
       }
     },
     "@ledgerhq/hw-transport-node-hid-noevents": {
-      "version": "5.46.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-5.46.0.tgz",
-      "integrity": "sha512-v9OkEQ6kUtDGESeM5DLWvjCQlkJwarH6Z1fWyWofoR9LLuas25/56R5uMMpOqXwmyk0kJVwg6PJ2Cg8rJBSG0w==",
-      "requires": {
-        "@ledgerhq/devices": "^5.46.0",
-        "@ledgerhq/errors": "^5.46.0",
-        "@ledgerhq/hw-transport": "^5.46.0",
-        "@ledgerhq/logs": "^5.46.0",
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-5.50.0.tgz",
+      "integrity": "sha512-23vjrwzXDpnP0C1JA6540vYpOMFMtVeHc8+iNDltHFhx0kIuAq70lzk7OV6z8TNGpTSrf5DCnKagOha2FIS0yQ==",
+      "requires": {
+        "@ledgerhq/devices": "^5.50.0",
+        "@ledgerhq/errors": "^5.50.0",
+        "@ledgerhq/hw-transport": "^5.50.0",
+        "@ledgerhq/logs": "^5.50.0",
         "node-hid": "2.1.1"
       }
     },
@@ -2102,20 +2102,20 @@
       }
     },
     "@ledgerhq/hw-transport-webusb": {
-      "version": "5.46.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-5.46.0.tgz",
-      "integrity": "sha512-X5Meh+78nYqzOgOMnqlYQslAzyPOmlgcc+DDtSoWOOwCJ+sCHQmmi+18/aoVgoLtVRpqGjVGxmCBYYX+f3EkOA==",
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-5.50.0.tgz",
+      "integrity": "sha512-dl/9uBajeCm3Vc6qy5IXYo+z2PWOs+MWfgKUSgMgm65AZfa2FByQLMv3a5GMOeRcte9fzuJUQIA4IcgYhZdkNQ==",
       "requires": {
-        "@ledgerhq/devices": "^5.46.0",
-        "@ledgerhq/errors": "^5.46.0",
-        "@ledgerhq/hw-transport": "^5.46.0",
-        "@ledgerhq/logs": "^5.46.0"
+        "@ledgerhq/devices": "^5.50.0",
+        "@ledgerhq/errors": "^5.50.0",
+        "@ledgerhq/hw-transport": "^5.50.0",
+        "@ledgerhq/logs": "^5.50.0"
       }
     },
     "@ledgerhq/logs": {
-      "version": "5.46.0",
-      "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-5.46.0.tgz",
-      "integrity": "sha512-WiFy1uwRhcqkj6aTSha532Nl6Gdsv5GN+Nsbp7pY66Zg+6WUE/SBmpwHEJfEXzEfARI5+A718a3trGinY6Dftg=="
+      "version": "5.50.0",
+      "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-5.50.0.tgz",
+      "integrity": "sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA=="
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.4",
@@ -2175,9 +2175,9 @@
       }
     },
     "@octokit/openapi-types": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-6.0.0.tgz",
-      "integrity": "sha512-CnDdK7ivHkBtJYzWzZm7gEkanA7gKH6a09Eguz7flHw//GacPJLmkHA3f3N++MJmlxD1Fl+mB7B32EEpSCwztQ=="
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-6.2.0.tgz",
+      "integrity": "sha512-V2vFYuawjpP5KUb8CPYsq20bXT4qnE8sH1QKpYqUlcNOntBiRr/VzGVvY0s+YXGgrVbFUVO4EI0VnHYSVBWfBg=="
     },
     "@octokit/plugin-paginate-rest": {
       "version": "1.1.2",
@@ -2222,17 +2222,15 @@
       }
     },
     "@octokit/request": {
-      "version": "5.4.14",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.14.tgz",
-      "integrity": "sha512-VkmtacOIQp9daSnBmDI92xNIeLuSRDOIuplp/CJomkvzt7M18NXgG044Cx/LFKLgjKt9T2tZR6AtJayba9GTSA==",
+      "version": "5.4.15",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.15.tgz",
+      "integrity": "sha512-6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag==",
       "requires": {
         "@octokit/endpoint": "^6.0.1",
         "@octokit/request-error": "^2.0.0",
         "@octokit/types": "^6.7.1",
-        "deprecation": "^2.0.0",
         "is-plain-object": "^5.0.0",
         "node-fetch": "^2.6.1",
-        "once": "^1.4.0",
         "universal-user-agent": "^6.0.0"
       },
       "dependencies": {
@@ -2297,11 +2295,11 @@
       }
     },
     "@octokit/types": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.13.0.tgz",
-      "integrity": "sha512-W2J9qlVIU11jMwKHUp5/rbVUeErqelCsO5vW5PKNb7wAXQVUz87Rc+imjlEvpvbH8yUb+KHmv8NEjVZdsdpyxA==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.0.tgz",
+      "integrity": "sha512-43qHvDsPsKgNt4W4al3dyU6s2XZ7ZMsiiIw8rQcM9CyEo7g9W8/6m1W4xHuRqmEjTfG1U4qsE/E4Jftw1/Ak1g==",
       "requires": {
-        "@octokit/openapi-types": "^6.0.0"
+        "@octokit/openapi-types": "^6.2.0"
       }
     },
     "@pmmmwh/react-refresh-webpack-plugin": {
@@ -4351,9 +4349,9 @@
       "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="
     },
     "before-after-hook": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.0.tgz",
-      "integrity": "sha512-jH6rKQIfroBbhEXVmI7XmXe3ix5S/PgJqpzdDPnR8JGLHWNYLsYZ6tK5iWOF/Ra3oqEX0NobXGlzbiylIzVphQ=="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.1.tgz",
+      "integrity": "sha512-/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw=="
     },
     "bfj": {
       "version": "7.0.2",
@@ -4416,9 +4414,9 @@
       "integrity": "sha1-XbBBataCJxLwd4NuJVe4aXwMfJk="
     },
     "bip39": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.3.tgz",
-      "integrity": "sha512-P0dKrz4g0V0BjXfx7d9QNkJ/Txcz/k+hM9TnjqjUaXtuOfAvxXSw2rJw8DX0e3ZPwnK/IgDxoRqf0bvoVCqbMg==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.4.tgz",
+      "integrity": "sha512-YZKQlb752TrUWqHWj7XAwCSjYEgGAk+/Aas3V7NyjQeZYsztO8JnQUaCWhcnL4T+jL8nvB8typ2jRPzTlgugNw==",
       "requires": {
         "@types/node": "11.11.6",
         "create-hash": "^1.1.0",
@@ -8023,9 +8021,9 @@
       }
     },
     "flowgen": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/flowgen/-/flowgen-1.13.0.tgz",
-      "integrity": "sha512-xgdbeWfhY5yayQ3PUTaPn9a0tPK21m5SEJSFZDZf0A0TuoLKYVXU3fhhAN9pokjDcb0E0FGh7EO3t3YNf/iXTw==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/flowgen/-/flowgen-1.14.1.tgz",
+      "integrity": "sha512-rpwM75zi4BH5CLHtak0/1wZ40/3eEi2E7CafjiGPnyL2b9y3zznSrgbNTnpkspU1o4C0Ypsvfwi0lFslIVxWVw==",
       "requires": {
         "@babel/code-frame": "^7.10.4",
         "@babel/highlight": "^7.10.4",
@@ -12741,9 +12739,9 @@
       }
     },
     "node-abi": {
-      "version": "2.21.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.21.0.tgz",
-      "integrity": "sha512-smhrivuPqEM3H5LmnY3KU6HfYv0u4QklgAxfFyRNujKUzbUcYZ+Jc2EhukB9SRcD2VpqhxM7n/MIcp1Ua1/JMg==",
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.26.0.tgz",
+      "integrity": "sha512-ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ==",
       "requires": {
         "semver": "^5.4.1"
       }
@@ -14760,9 +14758,9 @@
       }
     },
     "prebuild-install": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.1.tgz",
-      "integrity": "sha512-7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.2.tgz",
+      "integrity": "sha512-PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ==",
       "requires": {
         "detect-libc": "^1.0.3",
         "expand-template": "^2.0.3",
@@ -14770,15 +14768,14 @@
         "minimist": "^1.2.3",
         "mkdirp-classic": "^0.5.3",
         "napi-build-utils": "^1.0.1",
-        "node-abi": "^2.7.0",
+        "node-abi": "^2.21.0",
         "noop-logger": "^0.1.1",
         "npmlog": "^4.0.1",
         "pump": "^3.0.0",
         "rc": "^1.2.7",
         "simple-get": "^3.0.3",
         "tar-fs": "^2.0.0",
-        "tunnel-agent": "^0.6.0",
-        "which-pm-runs": "^1.0.0"
+        "tunnel-agent": "^0.6.0"
       }
     },
     "prelude-ls": {
@@ -14931,9 +14928,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "13.13.47",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.47.tgz",
-          "integrity": "sha512-R6851wTjN1YJza8ZIeX6puNBSi/ZULHVh4WVleA7q256l+cP2EtXnKbO455fTs2ytQk3dL9qkU+Wh8l/uROdKg=="
+          "version": "13.13.51",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.51.tgz",
+          "integrity": "sha512-66/xg5I5Te4oGi5Jws11PtNmKkZbOPZWyBZZ/l5AOrWj1Dyw+6Ge/JhYTq/2/Yvdqyhrue8RL+DGI298OJ0xcg=="
         }
       }
     },
@@ -16061,9 +16058,9 @@
       "dev": true
     },
     "rxjs": {
-      "version": "6.6.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz",
-      "integrity": "sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==",
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -18222,15 +18219,20 @@
       }
     },
     "usb": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/usb/-/usb-1.6.5.tgz",
-      "integrity": "sha512-gLVrerQce+F+TSkWgzXACV07nOw+uBlv0gT3svsqTWWxNDe3ESQBIhss3qonIDArMvWPJp6z3I4hXEDYTmPlHQ==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/usb/-/usb-1.7.0.tgz",
+      "integrity": "sha512-LHm9d389NCzZSMd0DnilxT5Lord4P2E3ETwP1LeuJcEBmI5uLJv8Sd18z/9bairUMbDnnNqX+Hi5Xkl93Kvdmw==",
       "requires": {
         "bindings": "^1.4.0",
-        "nan": "2.13.2",
+        "node-addon-api": "3.0.2",
         "prebuild-install": "^5.3.3"
       },
       "dependencies": {
+        "node-addon-api": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.2.tgz",
+          "integrity": "sha512-+D4s2HCnxPd5PjjI0STKwncjXTUKKqm74MDMz9OPXavjsGmjkvwgLtA5yoxJUdmpj52+2u+RrXgPipahKczMKg=="
+        },
         "prebuild-install": {
           "version": "5.3.6",
           "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz",
diff --git a/react-delegationdashboard/package.json b/react-delegationdashboard/package.json
index 7272b4a7..5b8a0bcc 100644
--- a/react-delegationdashboard/package.json
+++ b/react-delegationdashboard/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@elrondnetwork/erdjs": "^3.1.3",
+    "@elrondnetwork/erdjs": "^4.0.3",
     "@fortawesome/fontawesome-svg-core": "^1.2.34",
     "@fortawesome/free-solid-svg-icons": "^5.15.2",
     "@fortawesome/react-fontawesome": "^0.1.12",
diff --git a/react-delegationdashboard/src/components/ConfirmOnLedgerModal/index.tsx b/react-delegationdashboard/src/components/ConfirmOnLedgerModal/index.tsx
index c962fcf2..06b0308e 100644
--- a/react-delegationdashboard/src/components/ConfirmOnLedgerModal/index.tsx
+++ b/react-delegationdashboard/src/components/ConfirmOnLedgerModal/index.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Modal } from 'react-bootstrap';
 import { useDelegation } from 'helpers';
 import { DelegationTransactionType } from 'helpers/contractDataDefinitions';
-import { TransactionHash } from '@elrondnetwork/erdjs/out';
+import { TransactionHash } from '@elrondnetwork/erdjs';
 import TransactionStatusModal from 'components/LedgerTransactionStatus';
 import { useHistory } from 'react-router-dom';
 import { useContext, useDispatch } from 'context';
diff --git a/react-delegationdashboard/src/components/Layout/APRCalculation.ts b/react-delegationdashboard/src/components/Layout/APRCalculation.ts
index 8835ecbc..de381289 100644
--- a/react-delegationdashboard/src/components/Layout/APRCalculation.ts
+++ b/react-delegationdashboard/src/components/Layout/APRCalculation.ts
@@ -1,4 +1,4 @@
-import { ContractReturnData } from '@elrondnetwork/erdjs/out/smartcontracts/query';
+import { decodeString } from '@elrondnetwork/erdjs/out/smartcontracts/codec/binaryCodecUtils';
 import denominate from 'components/Denominate/formatters';
 import {
   yearSettings,
@@ -31,13 +31,16 @@ const calculateAPR = ({
   stats: Stats;
   networkConfig: NetworkConfig;
   networkStake: NetworkStake;
-  blsKeys: ContractReturnData[];
+  blsKeys: Buffer[];
   totalActiveStake: string;
 }) => {
   const allNodes = blsKeys.filter(
-    key => key.asString === 'staked' || key.asString === 'jailed' || key.asString === 'queued'
+    key =>
+      decodeString(key) === 'staked' ||
+      decodeString(key) === 'jailed' ||
+      decodeString(key) === 'queued'
   ).length;
-  const allActiveNodes = blsKeys.filter(key => key.asString === 'staked').length;
+  const allActiveNodes = blsKeys.filter(key => decodeString(key) === 'staked').length;
   if (allActiveNodes <= 0) {
     return '0.00';
   }
diff --git a/react-delegationdashboard/src/components/Layout/index.tsx b/react-delegationdashboard/src/components/Layout/index.tsx
index 15997e71..b3c0876b 100644
--- a/react-delegationdashboard/src/components/Layout/index.tsx
+++ b/react-delegationdashboard/src/components/Layout/index.tsx
@@ -1,4 +1,3 @@
-import { QueryResponse } from '@elrondnetwork/erdjs/out/smartcontracts/query';
 import BigNumber from 'bignumber.js';
 import denominate from 'components/Denominate/formatters';
 import { denomination, decimals, auctionContract, network } from 'config';
@@ -17,6 +16,13 @@ import { calculateAPR } from './APRCalculation';
 import Footer from './Footer';
 import Navbar from './Navbar';
 import axios from 'axios';
+import { QueryResponse } from '@elrondnetwork/erdjs';
+
+import {
+  decodeUnsignedNumber,
+  decodeBigNumber,
+  decodeString,
+} from '@elrondnetwork/erdjs/out/smartcontracts/codec/binaryCodecUtils';
 
 const getStakingSCBalance = async (): Promise<string> => {
   const result = await axios.get(`${network.apiAddress}/accounts/${auctionContract}`);
@@ -40,22 +46,23 @@ const Layout = ({ children, page }: { children: React.ReactNode; page: string })
   } = contractViews;
 
   const getContractOverviewType = (value: QueryResponse) => {
+    let response = value.outputUntyped();
     let initialOwnerFunds = denominate({
       decimals,
       denomination,
-      input: value.returnData[3].asBigInt.toFixed(),
+      input: decodeBigNumber(response[3]).toFixed(),
     });
     return new ContractOverview(
-      value.returnData[0].asHex.toString(),
-      (value.returnData[1].asNumber / 100).toString(),
-      value.returnData[2].asBigInt.toFixed(),
+      response[0].toString('hex'),
+      (decodeUnsignedNumber(response[1]) / 100).toString(),
+      decodeBigNumber(response[2]).toFixed(),
       initialOwnerFunds,
-      value.returnData[4]?.asString,
-      value.returnData[5]?.asBool,
-      value.returnData[6].asBool,
-      value.returnData[7]?.asString,
-      value.returnData[8].asBool,
-      value.returnData[9]?.asNumber * 6
+      decodeString(response[4]),
+      decodeString(response[5]),
+      decodeString(response[6]),
+      decodeString(response[7]),
+      decodeString(response[8]),
+      decodeUnsignedNumber(response[9]) * 6
     );
   };
 
@@ -63,10 +70,11 @@ const Layout = ({ children, page }: { children: React.ReactNode; page: string })
     if (value && value.returnData && value.returnData.length === 0) {
       return emptyAgencyMetaData;
     }
+    const response = value.outputUntyped();
     return new AgencyMetadata(
-      value.returnData[0]?.asString,
-      value.returnData[1]?.asString,
-      value.returnData[2]?.asString
+      decodeString(response[0]),
+      decodeString(response[1]),
+      decodeString(response[2])
     );
   };
   React.useEffect(() => {
@@ -87,10 +95,8 @@ const Layout = ({ children, page }: { children: React.ReactNode; page: string })
           metaData,
           numUsers,
           contractOverview,
-          {
-            returnData: [activeStake],
-          },
-          { returnData: blsKeys },
+          activeStake,
+          blsKeysResponse,
           networkStats,
           networkStake,
           networkConfig,
@@ -99,11 +105,11 @@ const Layout = ({ children, page }: { children: React.ReactNode; page: string })
         ]) => {
           dispatch({
             type: 'setNumUsers',
-            numUsers: numUsers.returnData[0].asNumber,
+            numUsers: decodeUnsignedNumber(numUsers.outputUntyped()[0]),
           });
           dispatch({
             type: 'setMinDelegationAmount',
-            minDelegationAmount: delegationManager.returnData[5].asNumber,
+            minDelegationAmount: decodeUnsignedNumber(delegationManager.outputUntyped()[0]),
           });
           const contract = getContractOverviewType(contractOverview);
           dispatch({
@@ -116,11 +122,14 @@ const Layout = ({ children, page }: { children: React.ReactNode; page: string })
           });
           dispatch({
             type: 'setTotalActiveStake',
-            totalActiveStake: activeStake.asBigInt.toFixed(),
+            totalActiveStake: decodeBigNumber(activeStake.outputUntyped()[0]).toFixed(),
           });
           dispatch({
             type: 'setNumberOfActiveNodes',
-            numberOfActiveNodes: blsKeys.filter(key => key.asString === 'staked').length.toString(),
+            numberOfActiveNodes: blsKeysResponse
+              .outputUntyped()
+              .filter(key => decodeString(key) === 'staked')
+              .length.toString(),
           });
           dispatch({
             type: 'setNetworkConfig',
@@ -151,8 +160,8 @@ const Layout = ({ children, page }: { children: React.ReactNode; page: string })
                 networkStake.QueueSize,
                 new BigNumber(stakingBalance) // Replace with the economics value from erdjs 4.x
               ),
-              blsKeys: blsKeys,
-              totalActiveStake: activeStake.asBigInt.toFixed(),
+              blsKeys: blsKeysResponse.outputUntyped(),
+              totalActiveStake: decodeBigNumber(activeStake.outputUntyped()[0]).toFixed(),
             })
           );
 
diff --git a/react-delegationdashboard/src/components/LedgerTransactionStatus/index.tsx b/react-delegationdashboard/src/components/LedgerTransactionStatus/index.tsx
index 71f61a43..3328a3d3 100644
--- a/react-delegationdashboard/src/components/LedgerTransactionStatus/index.tsx
+++ b/react-delegationdashboard/src/components/LedgerTransactionStatus/index.tsx
@@ -1,4 +1,4 @@
-import { TransactionHash } from '@elrondnetwork/erdjs/out';
+import { TransactionHash } from '@elrondnetwork/erdjs';
 import { faCheck, faHourglass, faTimes } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { useContext } from 'context';
@@ -81,7 +81,7 @@ const TransactionStatusModal = ({ show, txHash }: TransactionStatusModalType) =>
               icon={txDStatus.icon}
               className={`text-white ml-1 ${getStatus(txStatus.pending) && spin ? 'fa-spin' : ''}`}
             />
-            <StatusTxDetails txHash={txHash.hash} />
+            <StatusTxDetails txHash={txHash.toString()} />
           </div>
 
           <button
diff --git a/react-delegationdashboard/src/components/Overview/Cards/index.tsx b/react-delegationdashboard/src/components/Overview/Cards/index.tsx
index b4b71689..ffca22c7 100644
--- a/react-delegationdashboard/src/components/Overview/Cards/index.tsx
+++ b/react-delegationdashboard/src/components/Overview/Cards/index.tsx
@@ -3,7 +3,7 @@ import { decimals, denomination } from 'config';
 import { useContext } from 'context';
 import denominate from 'components/Denominate/formatters';
 import StatCard from 'components/StatCard';
-import { Address, NetworkStake } from '@elrondnetwork/erdjs/out';
+import { Address, NetworkStake } from '@elrondnetwork/erdjs';
 import { useState } from 'react';
 
 import SetPercentageFeeAction from './SetPercentageFeeAction';
diff --git a/react-delegationdashboard/src/components/Overview/Header/index.tsx b/react-delegationdashboard/src/components/Overview/Header/index.tsx
index 8503ad8f..0a273cd7 100644
--- a/react-delegationdashboard/src/components/Overview/Header/index.tsx
+++ b/react-delegationdashboard/src/components/Overview/Header/index.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
 import { Link, useLocation } from 'react-router-dom';
-import { Address } from '@elrondnetwork/erdjs/out';
+import { Address } from '@elrondnetwork/erdjs';
 import { useContext, useDispatch } from 'context';
 import SetAgencyMetaDataModal from './SetAgencyMetaDataModal';
 import { getItem } from 'storage/session';
diff --git a/react-delegationdashboard/src/context/state.tsx b/react-delegationdashboard/src/context/state.tsx
index ab83e766..a37527f0 100644
--- a/react-delegationdashboard/src/context/state.tsx
+++ b/react-delegationdashboard/src/context/state.tsx
@@ -92,10 +92,10 @@ export const emptyContractOverview: ContractOverview = {
   maxDelegationCap: '',
   initialOwnerFunds: '',
   automaticActivation: 'false',
-  withDelegationCap: false,
-  changeableServiceFee: false,
+  withDelegationCap: 'false',
+  changeableServiceFee: 'false',
   reDelegationCap: 'false',
-  createdNounce: false,
+  createdNounce: 'false',
   unBondPeriod: 0,
 };
 
diff --git a/react-delegationdashboard/src/contracts/ContractViews.ts b/react-delegationdashboard/src/contracts/ContractViews.ts
index afc59145..6a75383e 100644
--- a/react-delegationdashboard/src/contracts/ContractViews.ts
+++ b/react-delegationdashboard/src/contracts/ContractViews.ts
@@ -1,5 +1,4 @@
-import { Address, ContractFunction, Argument } from '@elrondnetwork/erdjs/out';
-import { Query } from '@elrondnetwork/erdjs/out/smartcontracts/query';
+import { Address, AddressValue, ContractFunction, Query } from '@elrondnetwork/erdjs';
 import { auctionContract, delegationManagerContract } from 'config';
 import { DappState } from '../context/state';
 
@@ -8,7 +7,7 @@ export const contractViews = {
     const query = new Query({
       address: new Address(delegationContract),
       func: new ContractFunction('getUserActiveStake'),
-      args: [Argument.fromPubkey(new Address(address))],
+      args: [new AddressValue(new Address(address))],
     });
     return dapp.proxy.queryContract(query);
   },
@@ -16,7 +15,7 @@ export const contractViews = {
     const query = new Query({
       address: new Address(delegationContract),
       func: new ContractFunction('getUserUnDelegatedList'),
-      args: [Argument.fromPubkey(new Address(address))],
+      args: [new AddressValue(new Address(address))],
     });
     return dapp.proxy.queryContract(query);
   },
@@ -24,7 +23,7 @@ export const contractViews = {
     const query = new Query({
       address: new Address(delegationContract),
       func: new ContractFunction('getClaimableRewards'),
-      args: [Argument.fromPubkey(new Address(address))],
+      args: [new AddressValue(new Address(address))],
     });
     return dapp.proxy.queryContract(query);
   },
@@ -67,7 +66,7 @@ export const contractViews = {
     const query = new Query({
       address: new Address(auctionContract),
       func: new ContractFunction('getBlsKeysStatus'),
-      args: [Argument.fromPubkey(new Address(delegationContract))],
+      args: [new AddressValue(new Address(delegationContract))],
     });
     return dapp.proxy.queryContract(query);
   },
diff --git a/react-delegationdashboard/src/contracts/Delegation.tsx b/react-delegationdashboard/src/contracts/Delegation.tsx
index 7e8634e8..83412ba4 100644
--- a/react-delegationdashboard/src/contracts/Delegation.tsx
+++ b/react-delegationdashboard/src/contracts/Delegation.tsx
@@ -54,7 +54,7 @@ export default class Delegation {
         console.warn('invalid signerProvider');
     }
 
-    return new Transaction();
+    throw new Error('invalid signerProvider');
   }
 
   private async sendTransactionBasedOnType(
@@ -77,7 +77,7 @@ export default class Delegation {
       let transaction = new Transaction({
         chainID: delegationTransactionType.chainId,
         receiver: this.contract.getAddress(),
-        value: Balance.eGLD(delegationTransactionType.value),
+        value: Balance.egld(delegationTransactionType.value),
         gasLimit: new GasLimit(delegationContract.gasLimit),
         data: payload,
         nonce: this.account?.nonce,
diff --git a/react-delegationdashboard/src/helpers/contractDataDefinitions.ts b/react-delegationdashboard/src/helpers/contractDataDefinitions.ts
index d81935d1..a628fcb7 100644
--- a/react-delegationdashboard/src/helpers/contractDataDefinitions.ts
+++ b/react-delegationdashboard/src/helpers/contractDataDefinitions.ts
@@ -7,10 +7,10 @@ export class ContractOverview {
   maxDelegationCap: string;
   initialOwnerFunds?: string;
   automaticActivation: string;
-  withDelegationCap?: boolean;
-  changeableServiceFee?: boolean;
+  withDelegationCap?: string;
+  changeableServiceFee?: string;
   reDelegationCap: string;
-  createdNounce?: boolean;
+  createdNounce?: string;
   unBondPeriod?: number;
   public constructor(
     ownerAddress: string = '',
@@ -18,10 +18,10 @@ export class ContractOverview {
     maxDelegationCap: string = '',
     initialOwnerFunds?: string,
     automaticActivation: string = 'false',
-    withDelegationCap: boolean = false,
-    changeableServiceFee?: boolean,
+    withDelegationCap: string = 'false',
+    changeableServiceFee?: string,
     reDelegationCap: string = 'false',
-    createdNounce?: boolean,
+    createdNounce?: string,
     unBondPeriod?: number
   ) {
     this.ownerAddress = ownerAddress;
diff --git a/react-delegationdashboard/src/helpers/decodePem.tsx b/react-delegationdashboard/src/helpers/decodePem.tsx
index f5b75897..78210157 100644
--- a/react-delegationdashboard/src/helpers/decodePem.tsx
+++ b/react-delegationdashboard/src/helpers/decodePem.tsx
@@ -1,5 +1,4 @@
-import { Address } from '@elrondnetwork/erdjs/out';
-import { BLS, ValidatorSecretKey } from '@elrondnetwork/erdjs/out/walletcore/validatorKeys';
+import { Address, BLS, ValidatorSecretKey } from '@elrondnetwork/erdjs';
 
 function hexStringToByte(str: string) {
   if (!str) {
diff --git a/react-delegationdashboard/src/helpers/useDelegation.ts b/react-delegationdashboard/src/helpers/useDelegation.ts
index 32bf8929..59e6522f 100644
--- a/react-delegationdashboard/src/helpers/useDelegation.ts
+++ b/react-delegationdashboard/src/helpers/useDelegation.ts
@@ -1,4 +1,4 @@
-import { TransactionHash } from '@elrondnetwork/erdjs/out';
+import { TransactionHash } from '@elrondnetwork/erdjs';
 import { useContext } from 'context';
 import { Delegation } from 'contracts';
 import { DelegationTransactionType } from './contractDataDefinitions';
@@ -16,7 +16,7 @@ export default function useDelegation({ handleClose, setLedgerDataError }: UseDe
     delegation
       .sendTransaction(transactionArguments)
       .then(transaction => {
-        handleClose(transaction.hash);
+        handleClose(transaction.getHash());
       })
       .catch(e => {
         if (e.statusCode in ledgerErrorCodes) {
diff --git a/react-delegationdashboard/src/pages/Dashboard/Delegation/index.tsx b/react-delegationdashboard/src/pages/Dashboard/Delegation/index.tsx
index e2a7159a..c8259053 100644
--- a/react-delegationdashboard/src/pages/Dashboard/Delegation/index.tsx
+++ b/react-delegationdashboard/src/pages/Dashboard/Delegation/index.tsx
@@ -8,6 +8,10 @@ import ClaimRewardsAction from '../Actions/ClaimRewardsAction';
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons';
 import State from 'components/State';
 import { denomination, decimals } from 'config';
+import {
+  decodeBigNumber,
+  decodeUnsignedNumber,
+} from '@elrondnetwork/erdjs/out/smartcontracts/codec/binaryCodecUtils';
 
 const MyDelegation = () => {
   const { dapp, address, egldLabel, delegationContract, loading } = useContext();
@@ -23,29 +27,31 @@ const MyDelegation = () => {
     dispatch({ type: 'loading', loading: true });
     getClaimableRewards(dapp, address, delegationContract)
       .then(value => {
-        if (value.returnData.length > 0 && value.returnData[0]?.asNumber !== 0) {
+        const response = value.outputUntyped();
+        if (response.length > 0 && decodeUnsignedNumber(response[0]) !== 0) {
           setDisplayRewards(true);
         }
         setClaimableRewards(
           denominate({
             denomination,
             decimals: 4,
-            input: value.returnData[0]?.asBigInt.toFixed(),
+            input: decodeBigNumber(response[0]).toFixed(),
           }) || ''
         );
       })
       .catch(e => console.error('getClaimableRewards error', e));
     getUserActiveStake(dapp, address, delegationContract)
       .then(value => {
+        const response = value.outputUntyped();
         setUserActiveStake(
           denominate({
             denomination,
             decimals,
-            input: value.returnData[0]?.asBigInt.toFixed(),
+            input: decodeBigNumber(response[0]).toFixed(),
           }) || ''
         );
-        setUserActiveNominatedStake(value.returnData[0]?.asBigInt.toFixed());
-        if (value.returnData.length > 0 && value.returnData[0]?.asNumber !== 0) {
+        setUserActiveNominatedStake(decodeBigNumber(response[0]).toFixed());
+        if (response.length > 0 && decodeUnsignedNumber(response[0]) !== 0) {
           setDisplayUndelegate(true);
         }
 
diff --git a/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx b/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx
index a3cdd004..ab9bb439 100644
--- a/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx
+++ b/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx
@@ -1,4 +1,4 @@
-import { QueryResponse } from '@elrondnetwork/erdjs/out/smartcontracts/query';
+import { QueryResponse } from '@elrondnetwork/erdjs';
 import * as React from 'react';
 import { useContext } from 'context';
 import { contractViews } from 'contracts/ContractViews';
@@ -6,6 +6,11 @@ import denominate from 'components/Denominate/formatters';
 import { denomination, decimals } from 'config';
 import UndelegatedValueRow from './UndelegatedValueRow';
 import { UndelegatedValueType } from './UndelegatedValueType';
+import {
+  decodeBigNumber,
+  decodeString,
+  decodeUnsignedNumber,
+} from '@elrondnetwork/erdjs/out/smartcontracts/codec/binaryCodecUtils';
 
 const UndelegatedListView = () => {
   const { dapp, address, delegationContract, networkConfig } = useContext();
@@ -21,7 +26,7 @@ const UndelegatedListView = () => {
     let roundsRemainingInEpoch =
       networkConfig.roundsPerEpoch - networkConfig.roundsPassedInCurrentEpoch;
     let roundEpochComplete = 0;
-    let epochsChangesRemaining = value.returnData[index + 1].asNumber;
+    let epochsChangesRemaining = decodeUnsignedNumber(value.outputUntyped()[index + 1]);
     if (epochsChangesRemaining > 1) {
       roundEpochComplete = (epochsChangesRemaining - 1) * networkConfig.roundsPerEpoch;
     } else {
@@ -39,11 +44,11 @@ const UndelegatedListView = () => {
     undelegatedList: UndelegatedValueType[]
   ) => {
     let timeLeft = 0;
-    if (value.returnData[index + 1].asString !== '') {
+    if (decodeString(value.outputUntyped()[index + 1]) !== '') {
       timeLeft = getTimeLeft(value, index, timeLeft);
     }
     const element = new UndelegatedValueType(
-      denomintateValue(value.returnData[index].asBigInt.toFixed()),
+      denomintateValue(decodeBigNumber(value.outputUntyped()[index]).toFixed()),
       timeLeft
     );
     undelegatedList.push(element);
diff --git a/react-delegationdashboard/src/pages/Dashboard/index.tsx b/react-delegationdashboard/src/pages/Dashboard/index.tsx
index e2b04aa8..ded4df76 100644
--- a/react-delegationdashboard/src/pages/Dashboard/index.tsx
+++ b/react-delegationdashboard/src/pages/Dashboard/index.tsx
@@ -4,7 +4,7 @@ import Delegation from './Delegation';
 import PendingUndelegated from './PendingUndelegated';
 import { Redirect } from 'react-router-dom';
 import Overview from 'components/Overview';
-import { Address } from '@elrondnetwork/erdjs/out';
+import { Address } from '@elrondnetwork/erdjs';
 import { AccountType } from 'helpers/contractDataDefinitions';
 import State from 'components/State';
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons';
diff --git a/react-delegationdashboard/src/pages/Home/Login/Wallet.tsx b/react-delegationdashboard/src/pages/Home/Login/Wallet.tsx
index ce07f31c..707fde88 100644
--- a/react-delegationdashboard/src/pages/Home/Login/Wallet.tsx
+++ b/react-delegationdashboard/src/pages/Home/Login/Wallet.tsx
@@ -1,4 +1,4 @@
-import { Address } from '@elrondnetwork/erdjs/out';
+import { Address } from '@elrondnetwork/erdjs';
 import React, { useEffect } from 'react';
 import { useContext, useDispatch } from 'context';
 import { getItem, removeItem, setItem } from 'storage/session';
diff --git a/react-delegationdashboard/src/pages/Ledger/AddressTable.tsx b/react-delegationdashboard/src/pages/Ledger/AddressTable.tsx
index 96a620f8..173f40b2 100644
--- a/react-delegationdashboard/src/pages/Ledger/AddressTable.tsx
+++ b/react-delegationdashboard/src/pages/Ledger/AddressTable.tsx
@@ -1,7 +1,7 @@
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import * as React from 'react';
 import { useContext, useDispatch } from 'context';
-import { HWProvider } from '@elrondnetwork/erdjs/out';
+import { HWProvider } from '@elrondnetwork/erdjs';
 import { faChevronLeft, faChevronRight, faCircleNotch } from '@fortawesome/free-solid-svg-icons';
 import AddressRow from './AddressRow';
 import { useHistory } from 'react-router-dom';
@@ -21,7 +21,6 @@ const AddressTable = ({
   const dispatch = useDispatch();
   const [startIndex, setStartIndex] = React.useState(0);
   const [accounts, setAccounts] = React.useState<string[]>([]);
-  const [error] = React.useState('');
   const [selectedAddress, setSelectedAddress] = React.useState('');
   const [selectedIndex, setSelectedIndex] = React.useState<number | undefined>();
   const hwWalletP = new HWProvider(dapp.proxy);
diff --git a/react-delegationdashboard/src/pages/Ledger/index.tsx b/react-delegationdashboard/src/pages/Ledger/index.tsx
index fe4fe249..0c079619 100644
--- a/react-delegationdashboard/src/pages/Ledger/index.tsx
+++ b/react-delegationdashboard/src/pages/Ledger/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { useContext, useDispatch } from 'context';
 import AddressTable from './AddressTable';
 import ConfirmedAddress from './ConfirmedAddress';
-import { HWProvider } from '@elrondnetwork/erdjs/out';
+import { HWProvider } from '@elrondnetwork/erdjs';
 import { useHistory } from 'react-router-dom';
 import LedgerConnect from './LedgerConnect';
 
diff --git a/react-delegationdashboard/src/pages/Owner/Nodes/AddNodeAction.tsx b/react-delegationdashboard/src/pages/Owner/Nodes/AddNodeAction.tsx
index ed24be16..8663cf1f 100644
--- a/react-delegationdashboard/src/pages/Owner/Nodes/AddNodeAction.tsx
+++ b/react-delegationdashboard/src/pages/Owner/Nodes/AddNodeAction.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { DropzoneFileType } from 'components/DropzonePem';
 import RequestVariablesModal from 'components/DropzonePem/RequestVariablesModal';
-import { BLS } from '@elrondnetwork/erdjs/out';
+import { BLS } from '@elrondnetwork/erdjs';
 import { DelegationTransactionType } from 'helpers/contractDataDefinitions';
 import { useDelegationWallet } from 'helpers/useDelegation';
 import { useContext } from 'context';
diff --git a/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx b/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx
index a2705b65..94a3f1f5 100644
--- a/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx
+++ b/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx
@@ -1,5 +1,4 @@
-import { Address, Argument, ContractFunction, TransactionHash } from '@elrondnetwork/erdjs/out';
-import { Query } from '@elrondnetwork/erdjs/out/smartcontracts/query';
+import { Address, BytesValue, ContractFunction, Query } from '@elrondnetwork/erdjs';
 import { faCaretDown, faSearch } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import moment from 'moment';
@@ -13,6 +12,7 @@ import { NodeType } from './helpers/nodeType';
 import { DelegationTransactionType } from 'helpers/contractDataDefinitions';
 import { useDelegationWallet } from 'helpers/useDelegation';
 import ConfirmOnLedgerModal from 'components/ConfirmOnLedgerModal';
+import { decodeUnsignedNumber } from '@elrondnetwork/erdjs/out/smartcontracts/codec/binaryCodecUtils';
 
 type ActionType = 'unStake' | 'unJail' | 'unBond' | 'reStake' | 'stake' | 'remove';
 
@@ -51,13 +51,13 @@ const NodeRow = ({ blsKey: key }: { blsKey: NodeType; index: number }) => {
     const query = new Query({
       address: new Address(stakingContract),
       func: new ContractFunction('getRemainingUnBondPeriod'),
-      args: [Argument.fromHex(key.blsKey)],
+      args: [BytesValue.fromUTF8(key.blsKey)],
     });
     if (key.status.key === 'unStaked') {
       dapp.proxy
         .queryContract(query)
         .then(value => {
-          const remainingUnBondPeriod = value.returnData[0].asNumber;
+          const remainingUnBondPeriod = decodeUnsignedNumber(value.outputUntyped()[0]);
           const newRemaining = remainingUnBondPeriod !== undefined ? remainingUnBondPeriod : 0;
 
           if (ref.current !== null) {
diff --git a/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts b/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts
index 27a5d331..d9bdcd02 100644
--- a/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts
+++ b/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts
@@ -1,5 +1,5 @@
-import { Address, Argument, ContractFunction } from '@elrondnetwork/erdjs/out';
-import { ContractReturnData, Query } from '@elrondnetwork/erdjs/out/smartcontracts/query';
+import { Address, AddressValue, BytesValue, ContractFunction, Query } from '@elrondnetwork/erdjs';
+import { decodeString } from '@elrondnetwork/erdjs/out/smartcontracts/codec/binaryCodecUtils';
 import { auctionContract, stakingContract } from 'config';
 import { DappState } from 'context/state';
 import { NodeType } from './nodeType';
@@ -15,8 +15,7 @@ export const getAllNodesStatus = (dapp: DappState, delegationContract?: string)
       .queryContract(query)
       .then(value => {
         let nodes = new Array<NodeType>();
-        let responseValues = value.returnData;
-        mapNodes(responseValues, nodes, []);
+        mapNodes(value.outputUntyped(), nodes, []);
         return resolve(nodes);
       })
       .catch(e => console.error('GetAllNodesStatus error ', e));
@@ -27,14 +26,14 @@ export const getBlsKeysStatus = (dapp: DappState, queued: any[], delegationContr
   const query = new Query({
     address: new Address(auctionContract),
     func: new ContractFunction('getBlsKeysStatus'),
-    args: [Argument.fromPubkey(new Address(delegationContract))],
+    args: [new AddressValue(new Address(delegationContract))],
   });
   return new Promise<Array<NodeType>>(resolve => {
     dapp.proxy
       .queryContract(query)
       .then(value => {
         let nodes = new Array<NodeType>();
-        let responseValues = value.returnData;
+        let responseValues = value.outputUntyped();
         mapNodes(responseValues.reverse(), nodes, queued);
         return resolve(nodes);
       })
@@ -50,7 +49,7 @@ export const getQueueSize = (dapp: DappState) => {
     dapp.proxy
       .queryContract(query)
       .then(value => {
-        return resolve(value.returnData[0].asString);
+        return resolve(value.outputTyped()[0].valueOf());
       })
       .catch(e => console.error('getQueueSize error', e));
   });
@@ -61,13 +60,13 @@ export const getQueueIndex = (blsKey: any, dapp: DappState) => {
     address: new Address(stakingContract),
     func: new ContractFunction('getQueueIndex'),
     caller: new Address(auctionContract),
-    args: [Argument.fromHex(blsKey)],
+    args: [BytesValue.fromUTF8(blsKey)],
   });
   return new Promise(resolve => {
     dapp.proxy
       .queryContract(query)
       .then(value => {
-        return resolve(value.returnData[0].asString);
+        return resolve(decodeString(value.outputUntyped()[0]));
       })
       .catch(e => console.error('getQueueIndex error', e));
   });
@@ -80,16 +79,16 @@ const isStatus = (value: string) => {
   return false;
 };
 
-const mapNodes = (responseValues: ContractReturnData[], nodes: NodeType[], queued: any[]) => {
+const mapNodes = (responseValues: Buffer[], nodes: NodeType[], queued: any[]) => {
   let status: { [key: string]: string };
   responseValues.forEach(value => {
-    if (isStatus(value.asString)) {
-      status = { key: value.asString, value: NodeStatus[value.asString] };
+    if (isStatus(decodeString(value))) {
+      status = { key: decodeString(value), value: NodeStatus[decodeString(value)] };
     } else {
       if (status.key === 'queued') {
-        queued.push(value.asHex);
+        queued.push(value.toString('hex'));
       }
-      nodes.push(new NodeType(value.asHex, status));
+      nodes.push(new NodeType(value.toString('hex'), status));
     }
   });
 };
diff --git a/react-delegationdashboard/src/pages/Owner/index.tsx b/react-delegationdashboard/src/pages/Owner/index.tsx
index f44739ac..7e11ca98 100644
--- a/react-delegationdashboard/src/pages/Owner/index.tsx
+++ b/react-delegationdashboard/src/pages/Owner/index.tsx
@@ -1,5 +1,5 @@
 import { Redirect } from 'react-router-dom';
-import { Address } from '@elrondnetwork/erdjs/out';
+import { Address } from '@elrondnetwork/erdjs';
 import { useEffect } from 'react';
 import { useContext, useDispatch } from 'context';
 import Overview from 'components/Overview';

From d53c0d6d64233a0d36682c71c8224bcd08560192 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 28 Apr 2021 16:57:55 +0300
Subject: [PATCH 02/10] Clean up references

---
 .../src/components/Layout/APRCalculation.ts         |  2 +-
 .../src/components/Layout/index.tsx                 |  5 ++---
 .../src/pages/Dashboard/Delegation/index.tsx        |  5 +----
 .../pages/Dashboard/PendingUndelegated/index.tsx    | 13 ++++++-------
 .../src/pages/Owner/Nodes/NodeRow.tsx               |  9 +++++++--
 .../src/pages/Owner/Nodes/helpers/keysFunctions.ts  | 10 ++++++++--
 6 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/react-delegationdashboard/src/components/Layout/APRCalculation.ts b/react-delegationdashboard/src/components/Layout/APRCalculation.ts
index de381289..669f0a6b 100644
--- a/react-delegationdashboard/src/components/Layout/APRCalculation.ts
+++ b/react-delegationdashboard/src/components/Layout/APRCalculation.ts
@@ -1,4 +1,4 @@
-import { decodeString } from '@elrondnetwork/erdjs/out/smartcontracts/codec/binaryCodecUtils';
+import { decodeString } from '@elrondnetwork/erdjs';
 import denominate from 'components/Denominate/formatters';
 import {
   yearSettings,
diff --git a/react-delegationdashboard/src/components/Layout/index.tsx b/react-delegationdashboard/src/components/Layout/index.tsx
index b3c0876b..018672de 100644
--- a/react-delegationdashboard/src/components/Layout/index.tsx
+++ b/react-delegationdashboard/src/components/Layout/index.tsx
@@ -16,13 +16,12 @@ import { calculateAPR } from './APRCalculation';
 import Footer from './Footer';
 import Navbar from './Navbar';
 import axios from 'axios';
-import { QueryResponse } from '@elrondnetwork/erdjs';
-
 import {
+  QueryResponse,
   decodeUnsignedNumber,
   decodeBigNumber,
   decodeString,
-} from '@elrondnetwork/erdjs/out/smartcontracts/codec/binaryCodecUtils';
+} from '@elrondnetwork/erdjs';
 
 const getStakingSCBalance = async (): Promise<string> => {
   const result = await axios.get(`${network.apiAddress}/accounts/${auctionContract}`);
diff --git a/react-delegationdashboard/src/pages/Dashboard/Delegation/index.tsx b/react-delegationdashboard/src/pages/Dashboard/Delegation/index.tsx
index c8259053..ffb3a1a9 100644
--- a/react-delegationdashboard/src/pages/Dashboard/Delegation/index.tsx
+++ b/react-delegationdashboard/src/pages/Dashboard/Delegation/index.tsx
@@ -8,10 +8,7 @@ import ClaimRewardsAction from '../Actions/ClaimRewardsAction';
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons';
 import State from 'components/State';
 import { denomination, decimals } from 'config';
-import {
-  decodeBigNumber,
-  decodeUnsignedNumber,
-} from '@elrondnetwork/erdjs/out/smartcontracts/codec/binaryCodecUtils';
+import { decodeBigNumber, decodeUnsignedNumber } from '@elrondnetwork/erdjs';
 
 const MyDelegation = () => {
   const { dapp, address, egldLabel, delegationContract, loading } = useContext();
diff --git a/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx b/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx
index ab9bb439..56592e8c 100644
--- a/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx
+++ b/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx
@@ -1,4 +1,9 @@
-import { QueryResponse } from '@elrondnetwork/erdjs';
+import {
+  QueryResponse,
+  decodeBigNumber,
+  decodeString,
+  decodeUnsignedNumber,
+} from '@elrondnetwork/erdjs';
 import * as React from 'react';
 import { useContext } from 'context';
 import { contractViews } from 'contracts/ContractViews';
@@ -6,16 +11,10 @@ import denominate from 'components/Denominate/formatters';
 import { denomination, decimals } from 'config';
 import UndelegatedValueRow from './UndelegatedValueRow';
 import { UndelegatedValueType } from './UndelegatedValueType';
-import {
-  decodeBigNumber,
-  decodeString,
-  decodeUnsignedNumber,
-} from '@elrondnetwork/erdjs/out/smartcontracts/codec/binaryCodecUtils';
 
 const UndelegatedListView = () => {
   const { dapp, address, delegationContract, networkConfig } = useContext();
   const { getUserUnDelegatedList } = contractViews;
-
   const [userUnstakeValue, setUserUnstakedValue] = React.useState(Array<UndelegatedValueType>());
 
   const denomintateValue = (value: string): string => {
diff --git a/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx b/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx
index 94a3f1f5..dba0b527 100644
--- a/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx
+++ b/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx
@@ -1,4 +1,10 @@
-import { Address, BytesValue, ContractFunction, Query } from '@elrondnetwork/erdjs';
+import {
+  Address,
+  BytesValue,
+  ContractFunction,
+  decodeUnsignedNumber,
+  Query,
+} from '@elrondnetwork/erdjs';
 import { faCaretDown, faSearch } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import moment from 'moment';
@@ -12,7 +18,6 @@ import { NodeType } from './helpers/nodeType';
 import { DelegationTransactionType } from 'helpers/contractDataDefinitions';
 import { useDelegationWallet } from 'helpers/useDelegation';
 import ConfirmOnLedgerModal from 'components/ConfirmOnLedgerModal';
-import { decodeUnsignedNumber } from '@elrondnetwork/erdjs/out/smartcontracts/codec/binaryCodecUtils';
 
 type ActionType = 'unStake' | 'unJail' | 'unBond' | 'reStake' | 'stake' | 'remove';
 
diff --git a/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts b/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts
index d9bdcd02..3caacb8a 100644
--- a/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts
+++ b/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts
@@ -1,5 +1,11 @@
-import { Address, AddressValue, BytesValue, ContractFunction, Query } from '@elrondnetwork/erdjs';
-import { decodeString } from '@elrondnetwork/erdjs/out/smartcontracts/codec/binaryCodecUtils';
+import {
+  Address,
+  AddressValue,
+  BytesValue,
+  ContractFunction,
+  decodeString,
+  Query,
+} from '@elrondnetwork/erdjs';
 import { auctionContract, stakingContract } from 'config';
 import { DappState } from 'context/state';
 import { NodeType } from './nodeType';

From d70f2b3874df78177d4e38846ee63a70b6ada5dd Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 28 Apr 2021 17:26:46 +0300
Subject: [PATCH 03/10] Fix withdraw modal close on ledger

---
 .../Dashboard/PendingUndelegated/UndelegatedValueRow.tsx      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/UndelegatedValueRow.tsx b/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/UndelegatedValueRow.tsx
index 1fb002ec..25d3aacc 100644
--- a/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/UndelegatedValueRow.tsx
+++ b/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/UndelegatedValueRow.tsx
@@ -72,7 +72,9 @@ const UndelegatedValueRow = ({
       <ConfirmOnLedgerModal
         show={showCheckYourLedgerModal}
         transactionArguments={transactionArguments}
-        handleClose={() => {}}
+        handleClose={() => {
+          setShowCheckYourLedgerModal(false);
+        }}
       />
     </>
   );

From ffefbdbf9c1f32010436a89674adde843645a393 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 28 Apr 2021 17:43:31 +0300
Subject: [PATCH 04/10] Update blsKey to hex

---
 react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx b/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx
index dba0b527..cd5ee5a8 100644
--- a/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx
+++ b/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx
@@ -31,8 +31,6 @@ const allowedActions: { [key: string]: ActionType[] } = {
 
 const NodeRow = ({ blsKey: key }: { blsKey: NodeType; index: number }) => {
   const { explorerAddress, dapp, ledgerAccount } = useContext();
-  const [showDelegateModal, setShowDelegateModal] = useState(false);
-  const [selectedAction, setSelectedAction] = useState('');
   const [showCheckYourLedgerModal, setShowCheckYourLedgerModal] = useState(false);
   const [transactionArguments, setTransactionArguments] = useState(
     new DelegationTransactionType('', '')
@@ -56,7 +54,7 @@ const NodeRow = ({ blsKey: key }: { blsKey: NodeType; index: number }) => {
     const query = new Query({
       address: new Address(stakingContract),
       func: new ContractFunction('getRemainingUnBondPeriod'),
-      args: [BytesValue.fromUTF8(key.blsKey)],
+      args: [BytesValue.fromHex(key.blsKey)],
     });
     if (key.status.key === 'unStaked') {
       dapp.proxy

From f51ad0140644d59af49b262c9d476d12407fbb63 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 28 Apr 2021 17:45:13 +0300
Subject: [PATCH 05/10] Blskey from hex

---
 .../src/pages/Owner/Nodes/helpers/keysFunctions.ts              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts b/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts
index 3caacb8a..2cc87402 100644
--- a/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts
+++ b/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts
@@ -66,7 +66,7 @@ export const getQueueIndex = (blsKey: any, dapp: DappState) => {
     address: new Address(stakingContract),
     func: new ContractFunction('getQueueIndex'),
     caller: new Address(auctionContract),
-    args: [BytesValue.fromUTF8(blsKey)],
+    args: [BytesValue.fromHex(blsKey)],
   });
   return new Promise(resolve => {
     dapp.proxy

From 640c99a83e7a3015ac7a757594aaa7b26bcdc399 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 28 Apr 2021 17:56:52 +0300
Subject: [PATCH 06/10] Update with delegation cap condition

---
 .../pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-delegationdashboard/src/pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx b/react-delegationdashboard/src/pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx
index b9d156b5..aa56c48f 100644
--- a/react-delegationdashboard/src/pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx
+++ b/react-delegationdashboard/src/pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx
@@ -40,7 +40,7 @@ const DelegateModal = ({ show, balance, handleClose, handleContinue }: DelegateM
   };
 
   const getAvailableToDelegate = () => {
-    if (contractOverview?.withDelegationCap) {
+    if (contractOverview?.withDelegationCap === 'true') {
       const bnAvailable = new BigNumber(entireBalanceMinusDust);
       const totalActive = denominate({
         input: totalActiveStake,

From 66eaa2fc6273be3c8b0e8d92703ee23e9b4111ad Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Wed, 28 Apr 2021 18:18:17 +0300
Subject: [PATCH 07/10] Update default service fee

---
 react-delegationdashboard/src/components/Layout/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-delegationdashboard/src/components/Layout/index.tsx b/react-delegationdashboard/src/components/Layout/index.tsx
index 018672de..b9725a62 100644
--- a/react-delegationdashboard/src/components/Layout/index.tsx
+++ b/react-delegationdashboard/src/components/Layout/index.tsx
@@ -168,7 +168,7 @@ const Layout = ({ children, page }: { children: React.ReactNode; page: string })
             type: 'setAprPercentage',
             aprPercentage: (
               APR -
-              APR * ((contract?.serviceFee ? parseFloat(contract.serviceFee) : 15) / 100)
+              APR * ((contract?.serviceFee ? parseFloat(contract.serviceFee) : 0) / 100)
             )
               .toFixed(2)
               .toString(),

From 3c6c539224ee952dfe33ab65a73d6bbe8f6e7c7c Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 29 Apr 2021 11:51:03 +0300
Subject: [PATCH 08/10] Update erdjs package

---
 react-delegationdashboard/package-lock.json   | 49 +++++++++++--------
 react-delegationdashboard/package.json        |  2 +-
 .../Actions/DelegateAction/DelegateModal.tsx  |  2 +-
 .../Dashboard/PendingUndelegated/index.tsx    |  5 +-
 4 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/react-delegationdashboard/package-lock.json b/react-delegationdashboard/package-lock.json
index 7c1aa618..062e4d8e 100644
--- a/react-delegationdashboard/package-lock.json
+++ b/react-delegationdashboard/package-lock.json
@@ -1121,9 +1121,9 @@
       }
     },
     "@elrondnetwork/erdjs": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@elrondnetwork/erdjs/-/erdjs-4.0.3.tgz",
-      "integrity": "sha512-M7jqzvKWYw8EUWgcSrxYcfKQ1HoMWjHnmRqRalCDZK3F+dNYJg1vpFJfuA+sRle73mW4FAqNO6uU4jHiGo1yrg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@elrondnetwork/erdjs/-/erdjs-4.1.0.tgz",
+      "integrity": "sha512-Mm+YEE15SXI34ftZxyY/BTLbEd3xn5LRo6KBnMcSqUAiMBULcMoBD8cGNFpswegWOpkC0cR0J4UCcYolVQd/qg==",
       "requires": {
         "@babel/runtime": "^7.11.2",
         "@elrondnetwork/bls-wasm": "^0.3.3",
@@ -1138,6 +1138,7 @@
         "blake2b": "^2.1.3",
         "ed25519-hd-key": "^1.1.2",
         "json-bigint": "^1.0.0",
+        "json-duplicate-key-handle": "^1.0.0",
         "keccak": "^3.0.1",
         "platform": "^1.3.6",
         "protobufjs": "^6.10.2",
@@ -2175,9 +2176,9 @@
       }
     },
     "@octokit/openapi-types": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-6.2.0.tgz",
-      "integrity": "sha512-V2vFYuawjpP5KUb8CPYsq20bXT4qnE8sH1QKpYqUlcNOntBiRr/VzGVvY0s+YXGgrVbFUVO4EI0VnHYSVBWfBg=="
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-6.2.1.tgz",
+      "integrity": "sha512-rSyuVb2zVwEbWpl1FJzVziyDfvEhNcvIsp6QxmEJkpiFuPfcZ4LwXz2/fhVdVC8Xy7BCugUQr7/ISdhYwgs3zQ=="
     },
     "@octokit/plugin-paginate-rest": {
       "version": "1.1.2",
@@ -2295,11 +2296,11 @@
       }
     },
     "@octokit/types": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.0.tgz",
-      "integrity": "sha512-43qHvDsPsKgNt4W4al3dyU6s2XZ7ZMsiiIw8rQcM9CyEo7g9W8/6m1W4xHuRqmEjTfG1U4qsE/E4Jftw1/Ak1g==",
+      "version": "6.14.1",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.14.1.tgz",
+      "integrity": "sha512-RDzkeFPaT2TgZcNtB2s1HtaMmtOrvXsc5VsAdpzApNkTwNN7Jk76RRCzGYhjm+hQ/HHuQXZkxUDWhJlt2QAyKQ==",
       "requires": {
-        "@octokit/openapi-types": "^6.2.0"
+        "@octokit/openapi-types": "^6.2.1"
       }
     },
     "@pmmmwh/react-refresh-webpack-plugin": {
@@ -4268,6 +4269,11 @@
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
     },
+    "backslash": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/backslash/-/backslash-0.2.0.tgz",
+      "integrity": "sha1-bDwfzn5+cUzPwQ/XTw9zQQZ3N18="
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -11903,6 +11909,14 @@
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
     },
+    "json-duplicate-key-handle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-duplicate-key-handle/-/json-duplicate-key-handle-1.0.0.tgz",
+      "integrity": "sha1-Bni9F4ItI9jA0JWLQwEYdfo382M=",
+      "requires": {
+        "backslash": "^0.2.0"
+      }
+    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -14908,9 +14922,9 @@
       "integrity": "sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg=="
     },
     "protobufjs": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.10.2.tgz",
-      "integrity": "sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.0.tgz",
+      "integrity": "sha512-i4usrGD86mtOLnoTwUsVXphDY7yHM2rDiV3JU4Ix43BOtHi0DHy5rSCciX8MRHSYHaxnoc0TcpwEBlrNUAxvQQ==",
       "requires": {
         "@protobufjs/aspromise": "^1.1.2",
         "@protobufjs/base64": "^1.1.2",
@@ -14923,15 +14937,8 @@
         "@protobufjs/pool": "^1.1.0",
         "@protobufjs/utf8": "^1.1.0",
         "@types/long": "^4.0.1",
-        "@types/node": "^13.7.0",
+        "@types/node": ">=13.7.0",
         "long": "^4.0.0"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "13.13.51",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.51.tgz",
-          "integrity": "sha512-66/xg5I5Te4oGi5Jws11PtNmKkZbOPZWyBZZ/l5AOrWj1Dyw+6Ge/JhYTq/2/Yvdqyhrue8RL+DGI298OJ0xcg=="
-        }
       }
     },
     "proxy-addr": {
diff --git a/react-delegationdashboard/package.json b/react-delegationdashboard/package.json
index 5b8a0bcc..9f3473d8 100644
--- a/react-delegationdashboard/package.json
+++ b/react-delegationdashboard/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@elrondnetwork/erdjs": "^4.0.3",
+    "@elrondnetwork/erdjs": "^4.1.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.34",
     "@fortawesome/free-solid-svg-icons": "^5.15.2",
     "@fortawesome/react-fontawesome": "^0.1.12",
diff --git a/react-delegationdashboard/src/pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx b/react-delegationdashboard/src/pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx
index aa56c48f..828c3ea0 100644
--- a/react-delegationdashboard/src/pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx
+++ b/react-delegationdashboard/src/pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx
@@ -40,7 +40,7 @@ const DelegateModal = ({ show, balance, handleClose, handleContinue }: DelegateM
   };
 
   const getAvailableToDelegate = () => {
-    if (contractOverview?.withDelegationCap === 'true') {
+    if (contractOverview && contractOverview?.withDelegationCap === 'true') {
       const bnAvailable = new BigNumber(entireBalanceMinusDust);
       const totalActive = denominate({
         input: totalActiveStake,
diff --git a/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx b/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx
index 56592e8c..54697a37 100644
--- a/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx
+++ b/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx
@@ -43,11 +43,12 @@ const UndelegatedListView = () => {
     undelegatedList: UndelegatedValueType[]
   ) => {
     let timeLeft = 0;
-    if (decodeString(value.outputUntyped()[index + 1]) !== '') {
+    const untypedResponse = value.outputUntyped();
+    if (decodeString(untypedResponse[index + 1]) !== '') {
       timeLeft = getTimeLeft(value, index, timeLeft);
     }
     const element = new UndelegatedValueType(
-      denomintateValue(decodeBigNumber(value.outputUntyped()[index]).toFixed()),
+      denomintateValue(decodeBigNumber(untypedResponse[index]).toFixed()),
       timeLeft
     );
     undelegatedList.push(element);

From 67027bdf97b793df4ec70a1dcfc56a5f9e08f1bd Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 29 Apr 2021 11:53:50 +0300
Subject: [PATCH 09/10] Cleanup code

---
 .../pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-delegationdashboard/src/pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx b/react-delegationdashboard/src/pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx
index 828c3ea0..bec3eb91 100644
--- a/react-delegationdashboard/src/pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx
+++ b/react-delegationdashboard/src/pages/Dashboard/Actions/DelegateAction/DelegateModal.tsx
@@ -40,7 +40,7 @@ const DelegateModal = ({ show, balance, handleClose, handleContinue }: DelegateM
   };
 
   const getAvailableToDelegate = () => {
-    if (contractOverview && contractOverview?.withDelegationCap === 'true') {
+    if (contractOverview && contractOverview.withDelegationCap === 'true') {
       const bnAvailable = new BigNumber(entireBalanceMinusDust);
       const totalActive = denominate({
         input: totalActiveStake,

From 60cb1cf9232b994a8345b06c4373a1d8afcbf778 Mon Sep 17 00:00:00 2001
From: danielailie <danielailie12@gmail.com>
Date: Thu, 29 Apr 2021 12:01:15 +0300
Subject: [PATCH 10/10] Cleanup code

---
 .../src/components/Layout/index.tsx           | 30 +++++++++----------
 .../src/pages/Dashboard/Delegation/index.tsx  | 14 ++++-----
 .../Dashboard/PendingUndelegated/index.tsx    |  3 +-
 .../src/pages/Owner/Nodes/NodeRow.tsx         |  3 +-
 .../Owner/Nodes/helpers/keysFunctions.ts      | 10 ++++---
 5 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/react-delegationdashboard/src/components/Layout/index.tsx b/react-delegationdashboard/src/components/Layout/index.tsx
index b9725a62..2ee48b1d 100644
--- a/react-delegationdashboard/src/components/Layout/index.tsx
+++ b/react-delegationdashboard/src/components/Layout/index.tsx
@@ -45,23 +45,23 @@ const Layout = ({ children, page }: { children: React.ReactNode; page: string })
   } = contractViews;
 
   const getContractOverviewType = (value: QueryResponse) => {
-    let response = value.outputUntyped();
+    let untypedResponse = value.outputUntyped();
     let initialOwnerFunds = denominate({
       decimals,
       denomination,
-      input: decodeBigNumber(response[3]).toFixed(),
+      input: decodeBigNumber(untypedResponse[3]).toFixed(),
     });
     return new ContractOverview(
-      response[0].toString('hex'),
-      (decodeUnsignedNumber(response[1]) / 100).toString(),
-      decodeBigNumber(response[2]).toFixed(),
+      untypedResponse[0].toString('hex'),
+      (decodeUnsignedNumber(untypedResponse[1]) / 100).toString(),
+      decodeBigNumber(untypedResponse[2]).toFixed(),
       initialOwnerFunds,
-      decodeString(response[4]),
-      decodeString(response[5]),
-      decodeString(response[6]),
-      decodeString(response[7]),
-      decodeString(response[8]),
-      decodeUnsignedNumber(response[9]) * 6
+      decodeString(untypedResponse[4]),
+      decodeString(untypedResponse[5]),
+      decodeString(untypedResponse[6]),
+      decodeString(untypedResponse[7]),
+      decodeString(untypedResponse[8]),
+      decodeUnsignedNumber(untypedResponse[9]) * 6
     );
   };
 
@@ -69,11 +69,11 @@ const Layout = ({ children, page }: { children: React.ReactNode; page: string })
     if (value && value.returnData && value.returnData.length === 0) {
       return emptyAgencyMetaData;
     }
-    const response = value.outputUntyped();
+    const untypedResponse = value.outputUntyped();
     return new AgencyMetadata(
-      decodeString(response[0]),
-      decodeString(response[1]),
-      decodeString(response[2])
+      decodeString(untypedResponse[0]),
+      decodeString(untypedResponse[1]),
+      decodeString(untypedResponse[2])
     );
   };
   React.useEffect(() => {
diff --git a/react-delegationdashboard/src/pages/Dashboard/Delegation/index.tsx b/react-delegationdashboard/src/pages/Dashboard/Delegation/index.tsx
index ffb3a1a9..eb58c123 100644
--- a/react-delegationdashboard/src/pages/Dashboard/Delegation/index.tsx
+++ b/react-delegationdashboard/src/pages/Dashboard/Delegation/index.tsx
@@ -24,31 +24,31 @@ const MyDelegation = () => {
     dispatch({ type: 'loading', loading: true });
     getClaimableRewards(dapp, address, delegationContract)
       .then(value => {
-        const response = value.outputUntyped();
-        if (response.length > 0 && decodeUnsignedNumber(response[0]) !== 0) {
+        const untypedResponse = value.outputUntyped();
+        if (untypedResponse.length > 0 && decodeUnsignedNumber(untypedResponse[0]) !== 0) {
           setDisplayRewards(true);
         }
         setClaimableRewards(
           denominate({
             denomination,
             decimals: 4,
-            input: decodeBigNumber(response[0]).toFixed(),
+            input: decodeBigNumber(untypedResponse[0]).toFixed(),
           }) || ''
         );
       })
       .catch(e => console.error('getClaimableRewards error', e));
     getUserActiveStake(dapp, address, delegationContract)
       .then(value => {
-        const response = value.outputUntyped();
+        const untypedResponse = value.outputUntyped();
         setUserActiveStake(
           denominate({
             denomination,
             decimals,
-            input: decodeBigNumber(response[0]).toFixed(),
+            input: decodeBigNumber(untypedResponse[0]).toFixed(),
           }) || ''
         );
-        setUserActiveNominatedStake(decodeBigNumber(response[0]).toFixed());
-        if (response.length > 0 && decodeUnsignedNumber(response[0]) !== 0) {
+        setUserActiveNominatedStake(decodeBigNumber(untypedResponse[0]).toFixed());
+        if (untypedResponse.length > 0 && decodeUnsignedNumber(untypedResponse[0]) !== 0) {
           setDisplayUndelegate(true);
         }
 
diff --git a/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx b/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx
index 54697a37..fc61b8ef 100644
--- a/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx
+++ b/react-delegationdashboard/src/pages/Dashboard/PendingUndelegated/index.tsx
@@ -22,10 +22,11 @@ const UndelegatedListView = () => {
   };
 
   const getTimeLeft = (value: QueryResponse, index: number, timeLeft: number) => {
+    const untypedResponse = value.outputUntyped();
     let roundsRemainingInEpoch =
       networkConfig.roundsPerEpoch - networkConfig.roundsPassedInCurrentEpoch;
     let roundEpochComplete = 0;
-    let epochsChangesRemaining = decodeUnsignedNumber(value.outputUntyped()[index + 1]);
+    let epochsChangesRemaining = decodeUnsignedNumber(untypedResponse[index + 1]);
     if (epochsChangesRemaining > 1) {
       roundEpochComplete = (epochsChangesRemaining - 1) * networkConfig.roundsPerEpoch;
     } else {
diff --git a/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx b/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx
index cd5ee5a8..eda5d647 100644
--- a/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx
+++ b/react-delegationdashboard/src/pages/Owner/Nodes/NodeRow.tsx
@@ -57,10 +57,11 @@ const NodeRow = ({ blsKey: key }: { blsKey: NodeType; index: number }) => {
       args: [BytesValue.fromHex(key.blsKey)],
     });
     if (key.status.key === 'unStaked') {
+      const untypedResponse = value.outputUntyped();
       dapp.proxy
         .queryContract(query)
         .then(value => {
-          const remainingUnBondPeriod = decodeUnsignedNumber(value.outputUntyped()[0]);
+          const remainingUnBondPeriod = decodeUnsignedNumber(untypedResponse[0]);
           const newRemaining = remainingUnBondPeriod !== undefined ? remainingUnBondPeriod : 0;
 
           if (ref.current !== null) {
diff --git a/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts b/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts
index 2cc87402..c06ae698 100644
--- a/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts
+++ b/react-delegationdashboard/src/pages/Owner/Nodes/helpers/keysFunctions.ts
@@ -21,7 +21,8 @@ export const getAllNodesStatus = (dapp: DappState, delegationContract?: string)
       .queryContract(query)
       .then(value => {
         let nodes = new Array<NodeType>();
-        mapNodes(value.outputUntyped(), nodes, []);
+        const untypedResponse = value.outputUntyped();
+        mapNodes(untypedResponse, nodes, []);
         return resolve(nodes);
       })
       .catch(e => console.error('GetAllNodesStatus error ', e));
@@ -39,8 +40,8 @@ export const getBlsKeysStatus = (dapp: DappState, queued: any[], delegationContr
       .queryContract(query)
       .then(value => {
         let nodes = new Array<NodeType>();
-        let responseValues = value.outputUntyped();
-        mapNodes(responseValues.reverse(), nodes, queued);
+        let untypedResponse = value.outputUntyped();
+        mapNodes(untypedResponse.reverse(), nodes, queued);
         return resolve(nodes);
       })
       .catch(e => console.error('GetBlsKeysStatus error', e));
@@ -72,7 +73,8 @@ export const getQueueIndex = (blsKey: any, dapp: DappState) => {
     dapp.proxy
       .queryContract(query)
       .then(value => {
-        return resolve(decodeString(value.outputUntyped()[0]));
+        const untypedResponse = value.outputUntyped();
+        return resolve(decodeString(untypedResponse[0]));
       })
       .catch(e => console.error('getQueueIndex error', e));
   });