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

Merge branch 'master' into feature/pacific-copy

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/.env.local.example
View File

@ -46,7 +46,7 @@ REACT_APP_BRIZO_ADDRESS="0x008c25ed3594e094db4592f4115d5fa74c4f41ea"
# #
# Connect to Spree (local with Barge) # 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_AQUARIUS_URI="http://aquarius:5000"
# REACT_APP_BRIZO_URI="http://localhost:8030" # REACT_APP_BRIZO_URI="http://localhost:8030"
# REACT_APP_SECRET_STORE_URI="http://localhost:12001" # REACT_APP_SECRET_STORE_URI="http://localhost:12001"

2
client/package.json
View File

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

2
client/src/components/molecules/AccountStatus/Popover.tsx
View File

@ -54,7 +54,7 @@ export default class Popover extends PureComponent<{
<div className={styles.popoverInfoline}> <div className={styles.popoverInfoline}>
{network && !isOceanNetwork {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`} : network && `Connected to ${network} network`}
</div> </div>
</> </>

2
client/src/components/organisms/Web3message.test.tsx
View File

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

2
client/src/data/web3message.json
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.", "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.", "noAccount": "No accounts detected. For publishing and downloading an asset you need to unlock your Web3 account.",
"hasAccount": "", "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>"
} }

2
client/src/routes/Faucet.tsx
View File

@ -118,7 +118,7 @@ export default class Faucet extends PureComponent<{}, FaucetState> {
return ( return (
<Route <Route
title="Faucet" 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> <Content>
<Web3message /> <Web3message />

8
library.json
View File

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