1
0
mirror of https://github.com/oceanprotocol/commons.git synced 2023-03-15 18:03:00 +01:00

Merge branch 'master' into feature/pacific-copy

This commit is contained in:
Matthias Kretschmann 2019-07-04 09:09:23 +01:00 committed by GitHub
commit f5c01a8e30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 10 deletions

View File

@ -46,7 +46,7 @@ REACT_APP_BRIZO_ADDRESS="0x008c25ed3594e094db4592f4115d5fa74c4f41ea"
#
# Connect to Spree (local with Barge)
#
# REACT_APP_NODE_URI="htts://localhost:8545"
# REACT_APP_NODE_URI="http://localhost:8545"
# REACT_APP_AQUARIUS_URI="http://aquarius:5000"
# REACT_APP_BRIZO_URI="http://localhost:8030"
# REACT_APP_SECRET_STORE_URI="http://localhost:12001"

View File

@ -13,7 +13,7 @@
},
"dependencies": {
"@oceanprotocol/art": "^2.2.0",
"@oceanprotocol/squid": "^0.6.2",
"@oceanprotocol/squid": "0.6.2",
"@oceanprotocol/typographies": "^0.1.0",
"@sindresorhus/slugify": "^0.9.1",
"axios": "^0.19.0",

View File

@ -54,7 +54,7 @@ export default class Popover extends PureComponent<{
<div className={styles.popoverInfoline}>
{network && !isOceanNetwork
? 'Please connect to Custom RPC\n https://nile.dev-ocean.com'
? 'Please connect to Custom RPC\n https://pacific.oceanprotocol.com'
: network && `Connected to ${network} network`}
</div>
</>

View File

@ -21,7 +21,7 @@ describe('Web3message', () => {
</User.Provider>
)
expect(container.firstChild).toHaveTextContent(
'Not connected to Nile network'
'Not connected to Pacific network'
)
})

View File

@ -2,5 +2,5 @@
"noweb3": "Not a Web3 Browser. For publishing and downloading an asset you need to <a href='https://docs.oceanprotocol.com/tutorials/metamask-setup/' target='_blank' rel='noopener noreferrer'>setup MetaMask</a> or use any other Web3-capable plugin or browser.",
"noAccount": "No accounts detected. For publishing and downloading an asset you need to unlock your Web3 account.",
"hasAccount": "",
"wrongNetwork": "Not connected to Nile network.<br />Please connect in MetaMask with Custom RPC <code>https://nile.dev-ocean.com</code>"
"wrongNetwork": "Not connected to Pacific network.<br />Please connect in MetaMask with Custom RPC <code>https://pacific.oceanprotocol.com</code>"
}

View File

@ -118,7 +118,7 @@ export default class Faucet extends PureComponent<{}, FaucetState> {
return (
<Route
title="Faucet"
description="Shower yourself with some Ether for Ocean's Nile test network."
description="Shower yourself with some Ether for Ocean's Pacific network."
>
<Content>
<Web3message />

View File

@ -7,19 +7,19 @@
"dependencies": [
{
"name": "keeper-contracts",
"version": "~0.9.7"
"version": "~0.10.3"
},
{
"name": "brizo",
"version": "~0.3.10"
"version": "~0.3.12"
},
{
"name": "aquarius",
"version": "~0.2.9"
"version": "~0.3.4"
},
{
"name": "squid-js",
"version": "~0.5.17"
"version": "~0.6.2"
},
{
"name": "faucet",