From 807723be350a60da97f25c53eed102bafcbf1c3c Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Tue, 14 May 2019 12:52:41 +0200
Subject: [PATCH] isCorrectNetwork -> isOceanNetwork

---
 client/__mocks__/user-mock.ts                 |  4 ++--
 .../molecules/AccountStatus/Indicator.tsx     |  2 +-
 .../molecules/AccountStatus/Popover.test.tsx  |  2 +-
 .../molecules/AccountStatus/Popover.tsx       |  4 ++--
 .../src/components/organisms/AssetsUser.tsx   |  4 ++--
 .../components/organisms/Web3message.test.tsx |  4 ++--
 .../src/components/organisms/Web3message.tsx  |  4 ++--
 client/src/config.ts                          | 13 ++++++-----
 client/src/context/UserProvider.tsx           | 22 +++++++++----------
 client/src/context/index.tsx                  |  2 +-
 client/src/routes/Details/AssetFile.test.tsx  |  2 +-
 client/src/routes/Details/AssetFile.tsx       |  4 ++--
 .../src/routes/Details/AssetFilesDetails.tsx  |  2 +-
 client/src/routes/Faucet.tsx                  |  2 +-
 client/src/routes/History.test.tsx            |  2 +-
 client/src/routes/History.tsx                 |  2 +-
 client/src/routes/Publish/index.tsx           |  2 +-
 client/src/routes/Search.test.tsx             |  2 +-
 18 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/client/__mocks__/user-mock.ts b/client/__mocks__/user-mock.ts
index b80f205..4f27379 100644
--- a/client/__mocks__/user-mock.ts
+++ b/client/__mocks__/user-mock.ts
@@ -2,7 +2,7 @@ const userMock = {
     isLogged: false,
     isLoading: false,
     isWeb3: false,
-    isCorrectNetwork: false,
+    isOceanNetwork: false,
     account: '',
     web3: {},
     ocean: {},
@@ -17,7 +17,7 @@ const userMockConnected = {
     isLogged: true,
     isLoading: false,
     isWeb3: true,
-    isCorrectNetwork: true,
+    isOceanNetwork: true,
     account: '0xxxxxx',
     web3: {},
     ocean: {},
diff --git a/client/src/components/molecules/AccountStatus/Indicator.tsx b/client/src/components/molecules/AccountStatus/Indicator.tsx
index b69ffbb..866922e 100644
--- a/client/src/components/molecules/AccountStatus/Indicator.tsx
+++ b/client/src/components/molecules/AccountStatus/Indicator.tsx
@@ -22,7 +22,7 @@ const Indicator = ({
             {states =>
                 !states.isWeb3 ? (
                     <span className={styles.statusIndicator} />
-                ) : !states.isLogged || !states.isCorrectNetwork ? (
+                ) : !states.isLogged || !states.isOceanNetwork ? (
                     <span className={styles.statusIndicatorCloseEnough} />
                 ) : states.isLogged ? (
                     <span className={styles.statusIndicatorActive} />
diff --git a/client/src/components/molecules/AccountStatus/Popover.test.tsx b/client/src/components/molecules/AccountStatus/Popover.test.tsx
index 12864fd..c0187eb 100644
--- a/client/src/components/molecules/AccountStatus/Popover.test.tsx
+++ b/client/src/components/molecules/AccountStatus/Popover.test.tsx
@@ -38,7 +38,7 @@ describe('Popover', () => {
             <User.Provider
                 value={{
                     ...userMockConnected,
-                    isCorrectNetwork: false,
+                    isOceanNetwork: false,
                     network: '1'
                 }}
             >
diff --git a/client/src/components/molecules/AccountStatus/Popover.tsx b/client/src/components/molecules/AccountStatus/Popover.tsx
index d5606dd..ca03683 100644
--- a/client/src/components/molecules/AccountStatus/Popover.tsx
+++ b/client/src/components/molecules/AccountStatus/Popover.tsx
@@ -13,7 +13,7 @@ export default class Popover extends PureComponent<{
             balance,
             network,
             isWeb3,
-            isCorrectNetwork
+            isOceanNetwork
         } = this.context
 
         return (
@@ -53,7 +53,7 @@ export default class Popover extends PureComponent<{
                         )}
 
                         <div className={styles.popoverInfoline}>
-                            {network && !isCorrectNetwork
+                            {network && !isOceanNetwork
                                 ? 'Please connect to Custom RPC\n https://nile.dev-ocean.com'
                                 : network && `Connected to ${network} network`}
                         </div>
diff --git a/client/src/components/organisms/AssetsUser.tsx b/client/src/components/organisms/AssetsUser.tsx
index 824d73f..bb675d1 100644
--- a/client/src/components/organisms/AssetsUser.tsx
+++ b/client/src/components/organisms/AssetsUser.tsx
@@ -57,10 +57,10 @@ export default class AssetsUser extends PureComponent<
     }
 
     public render() {
-        const { account, isCorrectNetwork } = this.context
+        const { account, isOceanNetwork } = this.context
 
         return (
-            isCorrectNetwork &&
+            isOceanNetwork &&
             account && (
                 <div className={styles.assetsUser}>
                     {this.props.recent && (
diff --git a/client/src/components/organisms/Web3message.test.tsx b/client/src/components/organisms/Web3message.test.tsx
index 155d4f4..9c5b223 100644
--- a/client/src/components/organisms/Web3message.test.tsx
+++ b/client/src/components/organisms/Web3message.test.tsx
@@ -28,7 +28,7 @@ describe('Web3message', () => {
     it('renders with noAccount message', () => {
         const { container } = render(
             <User.Provider
-                value={{ ...userMock, isWeb3: true, isCorrectNetwork: true }}
+                value={{ ...userMock, isWeb3: true, isOceanNetwork: true }}
             >
                 <Web3message />
             </User.Provider>
@@ -51,7 +51,7 @@ describe('Web3message', () => {
                 value={{
                     ...userMock,
                     isWeb3: true,
-                    isCorrectNetwork: true
+                    isOceanNetwork: true
                 }}
             >
                 <Web3message />
diff --git a/client/src/components/organisms/Web3message.tsx b/client/src/components/organisms/Web3message.tsx
index 0374986..e726ae8 100644
--- a/client/src/components/organisms/Web3message.tsx
+++ b/client/src/components/organisms/Web3message.tsx
@@ -32,7 +32,7 @@ export default class Web3message extends PureComponent {
     public render() {
         const {
             isWeb3,
-            isCorrectNetwork,
+            isOceanNetwork,
             isLogged,
             account,
             unlockAccounts
@@ -40,7 +40,7 @@ export default class Web3message extends PureComponent {
 
         return !isWeb3
             ? this.message(content.noweb3)
-            : !isCorrectNetwork
+            : !isOceanNetwork
             ? this.message(content.wrongNetwork)
             : !isLogged
             ? this.message(content.noAccount, '', unlockAccounts)
diff --git a/client/src/config.ts b/client/src/config.ts
index 63c9ef3..e238d0f 100644
--- a/client/src/config.ts
+++ b/client/src/config.ts
@@ -9,17 +9,17 @@ export const servicePort = process.env.REACT_APP_SERVICE_PORT || 4000
 // OCEAN REMOTE CONNECTIONS
 //
 export const nodeScheme = process.env.REACT_APP_NODE_SCHEME || 'https'
-export const nodeHost = process.env.REACT_APP_NODE_HOST || 'nile.dev-ocean.com'
+export const nodeHost = process.env.REACT_APP_NODE_HOST || 'duero.dev-ocean.com'
 export const nodePort = process.env.REACT_APP_NODE_PORT || 443
 
 export const aquariusScheme = process.env.REACT_APP_AQUARIUS_SCHEME || 'https'
 export const aquariusHost =
-    process.env.REACT_APP_AQUARIUS_HOST || 'nginx-aquarius.dev-ocean.com'
+    process.env.REACT_APP_AQUARIUS_HOST || 'aquarius.duero.dev-ocean.com'
 export const aquariusPort = process.env.REACT_APP_AQUARIUS_PORT || 443
 
 export const brizoScheme = process.env.REACT_APP_BRIZO_SCHEME || 'https'
 export const brizoHost =
-    process.env.REACT_APP_BRIZO_HOST || 'nginx-brizo.dev-ocean.com'
+    process.env.REACT_APP_BRIZO_HOST || 'brizo.duero.dev-ocean.com'
 export const brizoPort = process.env.REACT_APP_BRIZO_PORT || 443
 export const brizoAddress =
     process.env.REACT_APP_BRIZO_ADDRESS ||
@@ -27,18 +27,19 @@ export const brizoAddress =
 
 export const parityScheme = process.env.REACT_APP_PARITY_SCHEME || 'https'
 export const parityHost =
-    process.env.REACT_APP_PARITY_HOST || 'nile.dev-ocean.com'
+    process.env.REACT_APP_PARITY_HOST || 'duero.dev-ocean.com'
 export const parityPort = process.env.REACT_APP_PARITY_PORT || 443
 
 export const secretStoreScheme =
     process.env.REACT_APP_SECRET_STORE_SCHEME || 'https'
 export const secretStoreHost =
-    process.env.REACT_APP_SECRET_STORE_HOST || 'secret-store.dev-ocean.com'
+    process.env.REACT_APP_SECRET_STORE_HOST ||
+    'secret-store.duero.dev-ocean.com'
 export const secretStorePort = process.env.REACT_APP_SECRET_STORE_PORT || 443
 
 export const faucetScheme = process.env.REACT_APP_FAUCET_SCHEME || 'https'
 export const faucetHost =
-    process.env.REACT_APP_FAUCET_HOST || 'faucet.nile.dev-ocean.com'
+    process.env.REACT_APP_FAUCET_HOST || 'faucet.duero.dev-ocean.com'
 export const faucetPort = process.env.REACT_APP_FAUCET_PORT || 443
 
 //
diff --git a/client/src/context/UserProvider.tsx b/client/src/context/UserProvider.tsx
index 1d19131..c6a69dd 100644
--- a/client/src/context/UserProvider.tsx
+++ b/client/src/context/UserProvider.tsx
@@ -46,7 +46,7 @@ interface UserProviderState {
     isLogged: boolean
     isLoading: boolean
     isWeb3: boolean
-    isCorrectNetwork: boolean
+    isOceanNetwork: boolean
     account: string
     balance: {
         eth: number
@@ -74,7 +74,7 @@ export default class UserProvider extends PureComponent<{}, UserProviderState> {
         isLogged: false,
         isLoading: true,
         isWeb3: false,
-        isCorrectNetwork: false,
+        isOceanNetwork: false,
         balance: {
             eth: 0,
             ocn: 0
@@ -151,7 +151,7 @@ export default class UserProvider extends PureComponent<{}, UserProviderState> {
                 //
                 // Detecting network with window.web3
                 //
-                let isCorrectNetwork
+                let isOceanNetwork
 
                 await window.web3.eth.net.getId((err, netId) => {
                     if (err) return
@@ -159,7 +159,7 @@ export default class UserProvider extends PureComponent<{}, UserProviderState> {
                     const isNile = netId === 8995
                     const isDuero = netId === 2199
 
-                    isCorrectNetwork = isNile || isDuero
+                    isOceanNetwork = isNile || isDuero
 
                     const network = isNile
                         ? 'Nile'
@@ -168,14 +168,14 @@ export default class UserProvider extends PureComponent<{}, UserProviderState> {
                         : netId.toString()
 
                     if (
-                        isCorrectNetwork !== this.state.isCorrectNetwork ||
+                        isOceanNetwork !== this.state.isOceanNetwork ||
                         network !== this.state.network
                     ) {
-                        this.setState({ isCorrectNetwork, network })
+                        this.setState({ isOceanNetwork, network })
                     }
                 })
 
-                if (!isCorrectNetwork) {
+                if (!isOceanNetwork) {
                     web3 = this.state.web3 // eslint-disable-line
                 }
 
@@ -209,13 +209,13 @@ export default class UserProvider extends PureComponent<{}, UserProviderState> {
     }
 
     private fetchAccounts = async () => {
-        const { ocean, isWeb3, isLogged, isCorrectNetwork } = this.state
+        const { ocean, isWeb3, isLogged, isOceanNetwork } = this.state
 
         if (isWeb3) {
             let accounts
 
             // Modern dapp browsers
-            if (window.ethereum && !isLogged && isCorrectNetwork) {
+            if (window.ethereum && !isLogged && isOceanNetwork) {
                 // simply set to empty, and have user click a button somewhere
                 // to initiate account unlocking
                 accounts = []
@@ -259,10 +259,10 @@ export default class UserProvider extends PureComponent<{}, UserProviderState> {
             const network = await ocean.keeper.getNetworkName()
             const isNile = network === 'Nile'
             const isDuero = network === 'Development'
-            const isCorrectNetwork = isNile || isDuero
+            const isOceanNetwork = isNile || isDuero
 
             network !== this.state.network &&
-                this.setState({ isCorrectNetwork, network })
+                this.setState({ isOceanNetwork, network })
         }
     }
 
diff --git a/client/src/context/index.tsx b/client/src/context/index.tsx
index a64937e..0cdf47d 100644
--- a/client/src/context/index.tsx
+++ b/client/src/context/index.tsx
@@ -4,7 +4,7 @@ export const User = React.createContext({
     isLogged: false,
     isLoading: false,
     isWeb3: false,
-    isCorrectNetwork: false,
+    isOceanNetwork: false,
     account: '',
     web3: {},
     ocean: {},
diff --git a/client/src/routes/Details/AssetFile.test.tsx b/client/src/routes/Details/AssetFile.test.tsx
index d1c69c8..2b866d6 100644
--- a/client/src/routes/Details/AssetFile.test.tsx
+++ b/client/src/routes/Details/AssetFile.test.tsx
@@ -20,7 +20,7 @@ const contextConnectedMock = {
     isLogged: true,
     isLoading: false,
     isWeb3: true,
-    isCorrectNetwork: true,
+    isOceanNetwork: true,
     account: '',
     web3: {},
     ocean: {},
diff --git a/client/src/routes/Details/AssetFile.tsx b/client/src/routes/Details/AssetFile.tsx
index 6de7054..8c3ebb0 100644
--- a/client/src/routes/Details/AssetFile.tsx
+++ b/client/src/routes/Details/AssetFile.tsx
@@ -76,7 +76,7 @@ export default class AssetFile extends PureComponent<
     public render() {
         const { ddo, file } = this.props
         const { isLoading, message, error } = this.state
-        const { isLogged, isCorrectNetwork } = this.context
+        const { isLogged, isOceanNetwork } = this.context
         const { index } = file
 
         return (
@@ -102,7 +102,7 @@ export default class AssetFile extends PureComponent<
                         // https://github.com/oceanprotocol/squid-js/pull/221
                         // is released
                         onClick={() => this.purchaseAsset(ddo, index || 0)}
-                        disabled={!isLogged || !isCorrectNetwork}
+                        disabled={!isLogged || !isOceanNetwork}
                     >
                         Get file
                     </Button>
diff --git a/client/src/routes/Details/AssetFilesDetails.tsx b/client/src/routes/Details/AssetFilesDetails.tsx
index 5d16575..4199e82 100644
--- a/client/src/routes/Details/AssetFilesDetails.tsx
+++ b/client/src/routes/Details/AssetFilesDetails.tsx
@@ -19,7 +19,7 @@ export default class AssetFilesDetails extends PureComponent<{
                         <AssetFile key={file.index} ddo={ddo} file={file} />
                     ))}
                 </div>
-                {(!this.context.isCorrectNetwork || !this.context.isLogged) && (
+                {(!this.context.isOceanNetwork || !this.context.isLogged) && (
                     <Web3message />
                 )}
             </>
diff --git a/client/src/routes/Faucet.tsx b/client/src/routes/Faucet.tsx
index 76556dd..55130b3 100644
--- a/client/src/routes/Faucet.tsx
+++ b/client/src/routes/Faucet.tsx
@@ -81,7 +81,7 @@ export default class Faucet extends PureComponent<{}, FaucetState> {
                 primary
                 onClick={() => this.getTokens(this.context.requestFromFaucet)}
                 disabled={
-                    !this.context.isLogged || !this.context.isCorrectNetwork
+                    !this.context.isLogged || !this.context.isOceanNetwork
                 }
             >
                 Request Ether
diff --git a/client/src/routes/History.test.tsx b/client/src/routes/History.test.tsx
index 5eae99a..77bf454 100644
--- a/client/src/routes/History.test.tsx
+++ b/client/src/routes/History.test.tsx
@@ -14,7 +14,7 @@ describe('History', () => {
             isLogged: false,
             isLoading: false,
             isWeb3: false,
-            isCorrectNetwork: false,
+            isOceanNetwork: false,
             account: '',
             web3: {},
             ocean: {},
diff --git a/client/src/routes/History.tsx b/client/src/routes/History.tsx
index 2b13c28..70de132 100644
--- a/client/src/routes/History.tsx
+++ b/client/src/routes/History.tsx
@@ -8,7 +8,7 @@ export default class History extends Component {
     public render() {
         return (
             <Route title="History">
-                {(!this.context.isLogged || !this.context.isCorrectNetwork) && (
+                {(!this.context.isLogged || !this.context.isOceanNetwork) && (
                     <Web3message />
                 )}
 
diff --git a/client/src/routes/Publish/index.tsx b/client/src/routes/Publish/index.tsx
index 4bc1349..86b6857 100644
--- a/client/src/routes/Publish/index.tsx
+++ b/client/src/routes/Publish/index.tsx
@@ -319,7 +319,7 @@ class Publish extends Component<{}, PublishState> {
                 title="Publish"
                 description="Publish a new data set into the Ocean Protocol Network."
             >
-                {(!this.context.isLogged || !this.context.isCorrectNetwork) && (
+                {(!this.context.isLogged || !this.context.isOceanNetwork) && (
                     <Web3message />
                 )}
 
diff --git a/client/src/routes/Search.test.tsx b/client/src/routes/Search.test.tsx
index 7663f93..037d633 100644
--- a/client/src/routes/Search.test.tsx
+++ b/client/src/routes/Search.test.tsx
@@ -14,7 +14,7 @@ describe('Search', () => {
                     isLogged: false,
                     isLoading: false,
                     isWeb3: false,
-                    isCorrectNetwork: false,
+                    isOceanNetwork: false,
                     account: '',
                     web3: {},
                     ocean: {