From 67aa55725a87f5ac86509108a7d2d41dd1db6ac6 Mon Sep 17 00:00:00 2001 From: daoauth <57783762+daoauth@users.noreply.github.com> Date: Thu, 3 Sep 2020 02:58:41 +0900 Subject: [PATCH] Not implemented error with react native (#3666) * Not implemented error with react native https://github.com/ethereum/web3.js/commit/4161ec5d23a66507f1f2b570ae78ed007ded6a8c#r40444884 * Update helpers.js * Update helpers.js * Update helpers.js new URL(url) -> require('url').parse(url) * Update helpers.js * Update web3-shh.rst another example bug * Revert "Update web3-shh.rst" This reverts commit 69f5045e6a6769154f190edc258098a805d8971a. * Update CHANGELOG.md * Update packages/web3-providers-ws/src/helpers.js Co-authored-by: Wyatt Barnes * detect ReactNative Co-authored-by: Gregory Markou <16929357+GregTheGreek@users.noreply.github.com> Co-authored-by: Frankie Co-authored-by: Wyatt Barnes --- CHANGELOG.md | 3 ++- packages/web3-providers-ws/src/helpers.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e2b4800bb7..3448fba719e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -285,4 +285,5 @@ Released with 1.0.0-beta.37 code base. ### Fixed - Fix parsing of non-`eth_subscription` provider events (#3660) -- Fix return value for `clearSubscriptions` (#3689) +- Fix parsedUrl problem of websocket provider (#3666) +- Fix return value for `clearSubscriptions` (#3689) \ No newline at end of file diff --git a/packages/web3-providers-ws/src/helpers.js b/packages/web3-providers-ws/src/helpers.js index dc138114247..25347e3f2ff 100644 --- a/packages/web3-providers-ws/src/helpers.js +++ b/packages/web3-providers-ws/src/helpers.js @@ -1,8 +1,9 @@ var isNode = Object.prototype.toString.call(typeof process !== 'undefined' ? process : 0) === '[object process]'; +var isRN = typeof navigator !== 'undefined' && navigator.product === 'ReactNative'; var _btoa = null; var helpers = null; -if (isNode) { +if (isNode || isRN) { _btoa = function(str) { return Buffer.from(str).toString('base64'); };