Merge branch 'implement-ui' into feature/93-add-menu-overflow-button

docker/Makefile

@@ -28,7 +28,7 @@ run-ganache-test:
 # Rendezvous targets
 run-rendezvous:
 	@docker network create --driver bridge concordia_rendezvous_network || true &&\
-	docker run -d -p 9090:9090 --name concordia-rendezvous libp2p/js-libp2p-webrtc-star:version-0.20.1
+	docker run -d -p 9090:9090 --name concordia-rendezvous libp2p/js-libp2p-webrtc-star:version-0.20.5
 
 # Contracts targets
 build-contracts:

docker/docker-compose.yml

@@ -21,7 +21,7 @@ services:
     restart: always
 
   rendezvous:
-    image: libp2p/js-libp2p-webrtc-star:version-0.20.1
+    image: libp2p/js-libp2p-webrtc-star:version-0.20.5
     container_name: concordia-rendezvous
     networks:
       rendezvous_network:

packages/concordia-app/src/components/UsernameSelector.jsx

@@ -38,7 +38,7 @@ const UsernameSelector = (props) => {
         });
       } else {
         onErrorChangeCallback({
-          usernameChecked: checkedUsername !== undefined,
+          usernameChecked: true,
           error: false,
           errorMessage: null,
         });

packages/concordia-app/src/options/web3Options.js

@@ -17,7 +17,7 @@ const web3WebsocketOptions = {
 };
 
 const web3 = (WEB3_HOST !== undefined && WEB3_PORT !== undefined)
-  ? `ws://${WEB3_HOST}:${WEB3_PORT}`
+  ? new Web3.providers.WebsocketProvider(`ws://${WEB3_HOST}:${WEB3_PORT}`)
   : new Web3(Web3.givenProvider || new Web3.providers.WebsocketProvider(
     `ws://${WEB3_HOST_DEFAULT}:${WEB3_PORT_DEFAULT}`, web3WebsocketOptions,
   ));

packages/concordia-app/src/views/Profile/GeneralTab/index.jsx

@@ -66,7 +66,7 @@ const GeneralTab = (props) => {
     }
   }, [dispatch, profileAddress, users]);
 
-  const authorAvatar = useMemo(() => (profileMetadataFetched && userAvatarUrl !== null
+  const authorAvatar = useMemo(() => (profileMetadataFetched && userAvatarUrl
     ? (
         <Image
           className="general-tab-profile-picture"

packages/concordia-rendezvous/package.json

@@ -4,10 +4,9 @@
   "private": true,
   "description": "Rendezvous server for Concordia",
   "scripts": {
-    "rendezvous": "star-signal --port=9090 --host=127.0.0.1",
     "start": "star-signal --port=9090 --host=127.0.0.1"
   },
-  "devDependencies": {
+  "dependencies": {
-    "libp2p-webrtc-star": "~0.20.1"
+    "libp2p-webrtc-star": "~0.20.5"
   }
 }

yarn.lock

@@ -1537,10 +1537,10 @@
     redux-saga "~1.1.3"
     web3 "~1.3.0"
 
-"@ezerous/eth-identity-provider@^0.1.0":
+"@ezerous/eth-identity-provider@~0.1.2":
-  version "0.1.1"
+  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@ezerous/eth-identity-provider/-/eth-identity-provider-0.1.1.tgz#cc29d4554a177b98ed724cfd861ea86c8a87fc38"
+  resolved "https://registry.yarnpkg.com/@ezerous/eth-identity-provider/-/eth-identity-provider-0.1.2.tgz#c1489a8d3ef5aec93ee53e7d96363a67409b3ada"
-  integrity sha512-GeownhQwxFyKNFteCjSi+6HkmzvakTdRRHqD6kIoLwkAamhJ88mSOxFt2N4PMEmJySxdb6PZHPdovda5xENs8w==
+  integrity sha512-VfKzG0Hxv7IBZ06tIidtPRp/B4u+33Ug8dthXwYh0gGNuMIfXY9K0dR2gOZKYc6saS+pzTIEp/tjf5pb9V737Q==
   dependencies:
     level "~6.0.1"
     orbit-db-identity-provider "~0.3.1"
@@ -10755,7 +10755,7 @@ libp2p-webrtc-peer@^10.0.1:
     randombytes "^2.0.3"
     readable-stream "^3.4.0"
 
-libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.1:
+libp2p-webrtc-star@^0.20.1:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.2.tgz#9979e42d02c5f42fc78785b3c325b7f0fad50a35"
   integrity sha512-P4oZ/v/bhhR0U/dpq8QfzRyKE2l5L4KFM6yrc3j1bj+gbQLBMH2P76/N3jlHqTVBdYavOwdCEifXwfG/qGp+3Q==
@@ -10782,6 +10782,33 @@ libp2p-webrtc-star@^0.20.1, libp2p-webrtc-star@~0.20.1:
     stream-to-it "^0.2.2"
     streaming-iterables "^5.0.3"
 
+libp2p-webrtc-star@~0.20.5:
+  version "0.20.5"
+  resolved "https://registry.yarnpkg.com/libp2p-webrtc-star/-/libp2p-webrtc-star-0.20.5.tgz#c52364dfbe59fd8e5da0e32feeaca374d3a79f9a"
+  integrity sha512-Tny1+q0EY192WgrkNCV7360ifI3RXjMoao91qwLhNwx7ArsqVMzrZvBnK3MTMmYQaGE1W0n/CLlw/Nn344iv2Q==
+  dependencies:
+    "@hapi/hapi" "^20.0.0"
+    "@hapi/inert" "^6.0.3"
+    abortable-iterator "^3.0.0"
+    class-is "^1.1.0"
+    debug "^4.2.0"
+    err-code "^2.0.3"
+    ipfs-utils "^5.0.0"
+    it-pipe "^1.1.0"
+    libp2p-utils "^0.2.1"
+    libp2p-webrtc-peer "^10.0.1"
+    mafmt "^8.0.0"
+    menoetius "0.0.2"
+    minimist "^1.2.5"
+    multiaddr "^8.0.0"
+    p-defer "^3.0.0"
+    peer-id "^0.14.2"
+    prom-client "^12.0.0"
+    socket.io "^2.3.0"
+    socket.io-client "^2.3.0"
+    stream-to-it "^0.2.2"
+    streaming-iterables "^5.0.3"
+
 libp2p-websockets@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/libp2p-websockets/-/libp2p-websockets-0.14.0.tgz#e1c48d1787e88dee85db740598b9a6a687fe225c"