Browse Source

Merge branch 'develop' into 'master'

fix: add missing concordia prefix to package name directory, account for...

See merge request ecentrics/concordia!28
master
Apostolos Fanakis 3 years ago
parent
commit
8e63725317
  1. 4
      packages/concordia-app/package.json
  2. 1
      packages/concordia-app/src/redux/sagas/orbitSaga.js
  3. 8
      yarn.lock

4
packages/concordia-app/package.json

@ -1,6 +1,6 @@
{ {
"name": "concordia-app", "name": "concordia-app",
"version": "0.1.0", "version": "0.1.1",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "cross-env REACT_APP_VERSION=$npm_package_version REACT_APP_NAME=$npm_package_name react-scripts start", "start": "cross-env REACT_APP_VERSION=$npm_package_version REACT_APP_NAME=$npm_package_name react-scripts start",
@ -26,7 +26,7 @@
"dependencies": { "dependencies": {
"@ecentrics/breeze": "~0.7.0", "@ecentrics/breeze": "~0.7.0",
"@ecentrics/drizzle": "~0.5.0", "@ecentrics/drizzle": "~0.5.0",
"@ecentrics/eth-identity-provider": "~0.1.2", "@ecentrics/eth-identity-provider": "~0.2.0",
"@reduxjs/toolkit": "~1.4.0", "@reduxjs/toolkit": "~1.4.0",
"@welldone-software/why-did-you-render": "~6.0.5", "@welldone-software/why-did-you-render": "~6.0.5",
"apexcharts": "^3.26.0", "apexcharts": "^3.26.0",

1
packages/concordia-app/src/redux/sagas/orbitSaga.js

@ -30,6 +30,7 @@ function* orbitSaga() {
EthereumContractIdentityProvider.setContractAddress(contractAddress); EthereumContractIdentityProvider.setContractAddress(contractAddress);
EthereumContractIdentityProvider.setWeb3(web3); EthereumContractIdentityProvider.setWeb3(web3);
EthereumContractIdentityProvider.setStoreAuthDataLocally(true);
yield initOrbitDatabases({ breeze: res[1].breeze, account: res[2].accounts[0] }); yield initOrbitDatabases({ breeze: res[1].breeze, account: res[2].accounts[0] });
} }

8
yarn.lock

@ -1207,6 +1207,14 @@
level "~6.0.1" level "~6.0.1"
orbit-db-identity-provider "~0.3.1" orbit-db-identity-provider "~0.3.1"
"@ecentrics/eth-identity-provider@~0.2.0":
version "0.2.0"
resolved "https://registry.yarnpkg.com/@ecentrics/eth-identity-provider/-/eth-identity-provider-0.2.0.tgz#c7cd36e4c4f9e85d73082fba80cb43c9d7e4a4a3"
integrity sha512-AH4JXCee/wlD7FJwyLAmwjVJD1XP6TpSUzllUkpabptkhJkRNpQJypvDatN/1x2cCWGjSMBhoNXxCC5WDtobiw==
dependencies:
level "~6.0.1"
orbit-db-identity-provider "~0.3.1"
"@eslint/eslintrc@^0.4.0": "@eslint/eslintrc@^0.4.0":
version "0.4.0" version "0.4.0"
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"

Loading…
Cancel
Save