Browse Source

Up dependencies

develop
Ezerous 6 years ago
parent
commit
0a42c7f0dc
  1. 6
      app/package.json
  2. 2
      app/src/containers/LoadingContainer.js
  3. 5
      app/src/redux/actions/web3UtilsActions.js
  4. 8
      app/src/redux/sagas/web3UtilsSaga.js

6
app/package.json

@ -8,7 +8,7 @@
}, },
"dependencies": { "dependencies": {
"connected-react-router": "6.3.2", "connected-react-router": "6.3.2",
"drizzle": "1.3.3", "drizzle": "1.4.0",
"history": "4.9.0", "history": "4.9.0",
"ipfs": "github:ipfs/js-ipfs#e849dbcab4a313f7ffc1532a389097ee76344067", "ipfs": "github:ipfs/js-ipfs#e849dbcab4a313f7ffc1532a389097ee76344067",
"lodash.isequal": "4.5.0", "lodash.isequal": "4.5.0",
@ -19,7 +19,7 @@
"react-content-loader": "4.2.1", "react-content-loader": "4.2.1",
"react-dom": "16.8.6", "react-dom": "16.8.6",
"react-markdown": "4.0.6", "react-markdown": "4.0.6",
"react-redux": "6.0.1", "react-redux": "7.0.1",
"react-router-dom": "5.0.0", "react-router-dom": "5.0.0",
"react-scripts": "2.1.8", "react-scripts": "2.1.8",
"react-timeago": "4.4.0", "react-timeago": "4.4.0",
@ -28,7 +28,7 @@
"redux-saga": "0.16.2", "redux-saga": "0.16.2",
"semantic-ui-react": "0.86.0", "semantic-ui-react": "0.86.0",
"uuid": "3.3.2", "uuid": "3.3.2",
"web3": "1.0.0-beta.51" "web3": "1.0.0-beta.52"
}, },
"devDependencies": { "devDependencies": {
"libp2p-websocket-star-rendezvous": "0.3.0" "libp2p-websocket-star-rendezvous": "0.3.0"

2
app/src/containers/LoadingContainer.js

@ -17,7 +17,7 @@ class LoadingContainer extends Component {
<p><strong>This browser has no connection to the Ethereum network.</strong></p> <p><strong>This browser has no connection to the Ethereum network.</strong></p>
Please make sure that: Please make sure that:
<ul> <ul>
<li>You use MetaMask or a dedicated Ethereum browser (e.g. Mist or Parity)</li> <li>You use MetaMask or a dedicated Ethereum browser</li>
<li>They are pointed to the correct network</li> <li>They are pointed to the correct network</li>
<li>Your account is unlocked and the app has the rights to access it</li> <li>Your account is unlocked and the app has the rights to access it</li>
</ul> </ul>

5
app/src/redux/actions/web3UtilsActions.js

@ -1 +1,4 @@
export const WEB3_UTILS_SAGA_INITIALIZED = 'WEB3_UTILS_SAGA_INITIALIZED'; const WEB3_UTILS_SAGA_INITIALIZED = 'WEB3_UTILS_SAGA_INITIALIZED';
const WEB3_UTILS_SAGA_ERROR = 'WEB3_UTILS_SAGA_ERROR';
export { WEB3_UTILS_SAGA_INITIALIZED, WEB3_UTILS_SAGA_ERROR }

8
app/src/redux/sagas/web3UtilsSaga.js

@ -10,6 +10,7 @@ let initFlag, web3, forumContract;
function* init() { function* init() {
if (!initFlag) { if (!initFlag) {
try{
web3 = yield call(getWeb3); web3 = yield call(getWeb3);
forumContract = yield call(getContractInstance, { forumContract = yield call(getContractInstance, {
web3, artifact: Forum web3, artifact: Forum
@ -19,7 +20,12 @@ function* init() {
type: WEB3_UTILS_SAGA_INITIALIZED, ...[] type: WEB3_UTILS_SAGA_INITIALIZED, ...[]
}); });
} }
else console.warn('Attempted to reinitialize web3UtilsSaga!'); catch (error) {
console.error(`Error while initializing web3UtilsSaga: ${error}`);
}
}
else
console.warn('Attempted to reinitialize web3UtilsSaga!');
} }
// If the method below proves to be problematic/ineffective (i.e. getting current account // If the method below proves to be problematic/ineffective (i.e. getting current account

Loading…
Cancel
Save