From 385f7c1b1ab7cd5a018b70af3c44e3be2d04a4f9 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 28 Jul 2021 16:20:19 -0400
Subject: [PATCH 1/2] only show network settings on mainnet

---
 src/apps/Organization/Organization.js         |  3 ++-
 .../GlobalPreferencesButton.js                | 17 +++++++++++-----
 src/network-config.js                         |  4 ++++
 src/onboarding/Onboarding/OnboardingTopBar.js | 20 ++++++++++++-------
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/apps/Organization/Organization.js b/src/apps/Organization/Organization.js
index e3bf9b149..3817283c4 100644
--- a/src/apps/Organization/Organization.js
+++ b/src/apps/Organization/Organization.js
@@ -23,6 +23,7 @@ import { useRouting, ARAGONID_ENS_DOMAIN } from '../../routing'
 import airdrop, { testTokensEnabled } from '../../testnet/airdrop'
 import { toChecksumAddress } from '../../web3-utils'
 import { useWallet } from '../../wallet'
+import { isOnMainnet } from '../../network-config'
 
 const Organization = React.memo(function Organization({
   apps,
@@ -106,7 +107,7 @@ const Organization = React.memo(function Organization({
   const checksummedDaoAddr =
     daoAddress.address && toChecksumAddress(daoAddress.address)
   const enableTransactions = wallet.connected && wallet.account
-  const isMainnet = network.type === 'main'
+  const isMainnet = isOnMainnet(network.type)
   const shortAddresses = layoutName !== 'large'
 
   const organizationText = checksummedDaoAddr ? (
diff --git a/src/components/OrgView/GlobalPreferencesButton/GlobalPreferencesButton.js b/src/components/OrgView/GlobalPreferencesButton/GlobalPreferencesButton.js
index 0c7574ebb..d7e6b5e67 100644
--- a/src/components/OrgView/GlobalPreferencesButton/GlobalPreferencesButton.js
+++ b/src/components/OrgView/GlobalPreferencesButton/GlobalPreferencesButton.js
@@ -18,6 +18,8 @@ import { useRouting } from '../../../routing'
 import iconNetwork from '../../../assets/global-preferences-network.svg'
 import iconCustomLabels from '../../../assets/global-preferences-custom-labels.svg'
 import iconNotifications from '../../../assets/global-preferences-notifications.svg'
+import { useWallet } from '../../../wallet'
+import { isOnMainnet } from '../../../network-config'
 
 function GlobalPreferencesButton() {
   const theme = useTheme()
@@ -28,6 +30,9 @@ function GlobalPreferencesButton() {
   const [opened, setOpened] = useState(false)
   const containerRef = useRef()
 
+  const { networkType } = useWallet()
+  const isMainnet = isOnMainnet(networkType)
+
   const handleToggle = useCallback(() => setOpened(opened => !opened), [])
   const handleClose = useCallback(() => setOpened(false), [])
   const handleItemClick = useCallback(
@@ -102,11 +107,13 @@ function GlobalPreferencesButton() {
             icon={iconCustomLabels}
             label="Custom labels"
           />
-          <Item
-            onClick={() => handleItemClick('network')}
-            icon={iconNetwork}
-            label="Network"
-          />
+          {isMainnet && (
+            <Item
+              onClick={() => handleItemClick('network')}
+              icon={iconNetwork}
+              label="Network"
+            />
+          )}
           <Item
             onClick={() => handleItemClick('notifications')}
             icon={iconNotifications}
diff --git a/src/network-config.js b/src/network-config.js
index 1741977b0..0bd3fdcb8 100644
--- a/src/network-config.js
+++ b/src/network-config.js
@@ -161,3 +161,7 @@ export function useNetworkConfig() {
   const { networkType } = useWallet()
   return getNetworkConfig(networkType)
 }
+
+export function isOnMainnet(networkType) {
+  return networkType === 'main'
+}
diff --git a/src/onboarding/Onboarding/OnboardingTopBar.js b/src/onboarding/Onboarding/OnboardingTopBar.js
index eb76ed1ab..4e610269c 100644
--- a/src/onboarding/Onboarding/OnboardingTopBar.js
+++ b/src/onboarding/Onboarding/OnboardingTopBar.js
@@ -3,9 +3,13 @@ import PropTypes from 'prop-types'
 import { Button, GU, IconSettings, useTheme } from '@aragon/ui'
 import AccountModule from '../../components/AccountModule/AccountModule'
 import HomeButton from '../../components/HomeButton/HomeButton'
+import { useWallet } from '../../wallet'
+import { isOnMainnet } from '../../network-config'
 
 function OnboardingTopBar({ status, solid }) {
   const theme = useTheme()
+  const { networkType } = useWallet()
+  const isMainnet = isOnMainnet(networkType)
 
   const handleSettingsClick = useCallback(() => {
     let path = '/'
@@ -71,13 +75,15 @@ function OnboardingTopBar({ status, solid }) {
           >
             <AccountModule />
           </div>
-          <Button
-            display="icon"
-            icon={<IconSettings />}
-            label="Settings"
-            size="medium"
-            onClick={handleSettingsClick}
-          />
+          {isMainnet && (
+            <Button
+              display="icon"
+              icon={<IconSettings />}
+              label="Settings"
+              size="medium"
+              onClick={handleSettingsClick}
+            />
+          )}
         </div>
       </div>
     </React.Fragment>

From d87c2d1d2f2cd75e4b83f5b514aa7fced7f32ddc Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 28 Jul 2021 16:21:47 -0400
Subject: [PATCH 2/2] duplicate import

---
 src/apps/Organization/Organization.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/apps/Organization/Organization.js b/src/apps/Organization/Organization.js
index 3817283c4..915e615b4 100644
--- a/src/apps/Organization/Organization.js
+++ b/src/apps/Organization/Organization.js
@@ -17,13 +17,16 @@ import {
 import LocalIdentityBadge from '../../components/IdentityBadge/LocalIdentityBadge'
 import appIds from '../../known-app-ids'
 import { getProviderString } from 'use-wallet'
-import { sanitizeNetworkType, getNetworkConfig } from '../../network-config'
+import {
+  sanitizeNetworkType,
+  getNetworkConfig,
+  isOnMainnet,
+} from '../../network-config'
 import { AppType, DaoAddressType } from '../../prop-types'
 import { useRouting, ARAGONID_ENS_DOMAIN } from '../../routing'
 import airdrop, { testTokensEnabled } from '../../testnet/airdrop'
 import { toChecksumAddress } from '../../web3-utils'
 import { useWallet } from '../../wallet'
-import { isOnMainnet } from '../../network-config'
 
 const Organization = React.memo(function Organization({
   apps,