Update fork from initial repo

.github/workflows/deploy.yml

@@ -27,26 +27,54 @@ jobs:
     needs: [build]
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+    - name: build
+      run: |
+        yarn --frozen-lockfile
+        yarn build
     - name: Release
       env:
-        GITHUB_TOKEN: ${{ secrets.MERGE_RELEASE_GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
       uses: mikeal/merge-release@master
 
   deploy-website:
     needs: [build]
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout
+      uses: actions/checkout@v1
     - name: Install, build & prepare
       run: |
+        yarn --frozen-lockfile
+        yarn build
+        yarn link
         cd gallery
+        yarn link @aragon/ui
         yarn --frozen-lockfile
         yarn build
         echo 'ui.aragon.org' > dist/CNAME
         cp public/favicon.svg dist
-    - name: Push to gh-pages
+    - name: save build away
+      id: temp
+      run: |
+        TEMP=$(mktemp -d)
+        cp -R gallery/dist/* $TEMP
+        echo "::set-output name=temp::$TEMP"
+    - name: Checkout pages
+      uses: actions/checkout@v2
+      with:
+        ref: gh-pages
+        path: pages
+    - name: copy build
       env:
-        ACTIONS_DEPLOY_KEY: ${{ secrets.GH_PAGES_ACTIONS_DEPLOY_KEY }}
-        PUBLISH_BRANCH: gh-pages
-        PUBLISH_DIR: ./gallery/dist
-      uses: peaceiris/actions-gh-pages@v2
+        TEMP: ${{ steps.temp.outputs.temp }}
+      run: |
+        cp -R $TEMP/* ./pages/
+    - name: commit and push
+      uses: actions-js/push@master
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        branch: 'gh-pages'
+        directory: './pages'

.gitignore

@@ -1,5 +1,5 @@
-dist/
 /lib/
+dist/
 node_modules/
 npm-debug.log
 package-lock.json

devbox/apps/DataView.js

@@ -232,7 +232,7 @@ const DEMOS = new Map([
         ]}
         renderEntryActions={entry => (
           <ContextMenu>
-            <ContextMenuItem>Open on Etherscan</ContextMenuItem>
+            <ContextMenuItem>Open on Explorer</ContextMenuItem>
           </ContextMenu>
         )}
       />
@@ -285,7 +285,7 @@ const DEMOS = new Map([
         ]}
         renderEntryActions={() => (
           <ContextMenu>
-            <ContextMenuItem>Open on Etherscan</ContextMenuItem>
+            <ContextMenuItem>Open on Explorer</ContextMenuItem>
           </ContextMenu>
         )}
         renderEntryExpansion={([_, entities]) => {
@@ -359,7 +359,7 @@ const DEMOS = new Map([
         ]}
         renderEntryActions={() => (
           <ContextMenu>
-            <ContextMenuItem>Open on Etherscan</ContextMenuItem>
+            <ContextMenuItem>Open on Explorer</ContextMenuItem>
           </ContextMenu>
         )}
         renderEntryExpansion={([action, entities, manager, height]) => (

devbox/apps/DataView/DataViewExpansion.js

@@ -61,7 +61,7 @@ function DataViewExpansion(props) {
       ]}
       renderEntryActions={() => (
         <ContextMenu>
-          <ContextMenuItem>Open on Etherscan</ContextMenuItem>
+          <ContextMenuItem>Open on Explorer</ContextMenuItem>
         </ContextMenu>
       )}
       renderEntryExpansion={([_, entities]) => {

devbox/yarn.lock

@@ -3187,9 +3187,9 @@ [email protected]:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.4, ini@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 internal-ip@^4.3.0:
   version "4.3.0"

gallery/yarn.lock

@@ -3128,9 +3128,9 @@ [email protected]:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 internal-ip@^4.3.0:
   version "4.3.0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aragon/ui",
-  "version": "1.7.0",
+  "version": "1.9.3",
   "author": "Aragon Association <[email protected]>",
   "license": "MIT",
   "repository": "github:aragon/aragon-ui",

src/components/Accordion/Accordion.js

@@ -2,7 +2,12 @@ import React, { useCallback, useMemo } from 'react'
 import PropTypes from 'prop-types'
 import DataView from '../DataView/DataView'
 
-const Accordion = React.memo(function Accordion({ items, className, style }) {
+const Accordion = React.memo(function Accordion({
+  items,
+  className,
+  style,
+  mode,
+}) {
   const fields = useMemo(() => [null], [])
   const renderEntry = useCallback(([row]) => [row], [])
   const renderEntryExpansion = useCallback(
@@ -19,6 +24,7 @@ const Accordion = React.memo(function Accordion({ items, className, style }) {
       renderEntry={renderEntry}
       renderEntryExpansion={renderEntryExpansion}
       style={style}
+      mode={mode}
     />
   )
 })
@@ -31,6 +37,7 @@ Accordion.propTypes = {
   className: PropTypes.string,
   items: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.node)).isRequired,
   style: PropTypes.object,
+  mode: PropTypes.oneOf(['adaptive', 'table', 'list']),
 }
 
 export default Accordion

src/components/AppBadge/AppBadgePopover.js

@@ -31,7 +31,7 @@ const AppBadgePopover = React.memo(function AppBadgePopover({
           )}
         </ImageExists>
       }
-      link={etherscanUrl && <Link href={etherscanUrl}>See on Etherscan</Link>}
+      link={etherscanUrl && <Link href={etherscanUrl}>See on Explorer</Link>}
       onClose={onClose}
       opener={opener}
       popoverAction={popoverAction}

src/components/DateRangePicker/MonthDay.js

@@ -164,4 +164,16 @@ function WrappedMonthDay({ onClick, ...props }) {
   }
 }
 
+WrappedMonthDay.propTypes = {
+  children: PropTypes.node,
+  disabled: PropTypes.bool,
+  selected: PropTypes.bool,
+  inRange: PropTypes.bool,
+  rangeBoundaryBegin: PropTypes.bool,
+  rangeBoundaryEnd: PropTypes.bool,
+  today: PropTypes.bool,
+  weekDay: PropTypes.bool,
+  onClick: PropTypes.func,
+}
+
 export default WrappedMonthDay

src/components/IdentityBadge/IdentityBadgePopover.js

@@ -23,7 +23,7 @@ const IdentityBadgePopover = React.memo(function IdentityBadgePopover({
   return (
     <BadgePopoverBase
       addressField={<AddressField address={address} />}
-      link={etherscanUrl && <Link href={etherscanUrl}>See on Etherscan</Link>}
+      link={etherscanUrl && <Link href={etherscanUrl}>See on Explorer</Link>}
       onClose={onClose}
       opener={opener}
       popoverAction={popoverAction}

src/components/Input/Checkbox.js

@@ -35,7 +35,10 @@ class Checkbox extends React.PureComponent {
     if (checked) return 'true'
     return 'false'
   }
-  handleClick = () => {
+  handleKeyPress = e => {
+    e.preventDefault()
+  }
+  handleClick = e => {
     const { onChange, checked, indeterminate } = this.props
     onChange(indeterminate ? false : !checked)
   }
@@ -95,6 +98,7 @@ class Checkbox extends React.PureComponent {
             tabIndex={tabIndex}
             aria-checked={this.getAriaChecked()}
             onClick={this.handleClick}
+            onKeyPress={this.handleKeyPress}
             onFocus={onFocus}
             disabled={disabled}
             css={`

src/components/TokenBadge/TokenBadgePopover.js

@@ -34,7 +34,7 @@ const TokenBadgePopover = React.memo(function TokenBadgePopover({
           <AddressField address={address} />
         )
       }
-      link={etherscanUrl && <Link href={etherscanUrl}>See on Etherscan</Link>}
+      link={etherscanUrl && <Link href={etherscanUrl}>See on Explorer</Link>}
       onClose={onClose}
       opener={opener}
       title={title}

src/components/TransactionProgress/TransactionProgress.js

@@ -83,7 +83,7 @@ const TransactionProgress = React.memo(function TransactionProgress({
             </div>
           )}
           <Link href={transactionHashUrl} css="text-decoration: none">
-            See on Etherscan
+            See on Explorer
           </Link>
         </div>
       </section>

src/utils/web3.js

@@ -10,37 +10,43 @@ const ADDRESS_REGEX = /^0x[0-9a-fA-F]{40}$/
 const TRUST_WALLET_BASE_URL =
   'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum'
 
-const ETHERSCAN_NETWORK_TYPES = new Map([
-  ['main', ''],
-  ['kovan', 'kovan.'],
-  ['rinkeby', 'rinkeby.'],
-  ['ropsten', 'ropsten.'],
-  ['goerli', 'goerli.'],
+const ETHERSCAN_URL = 'etherscan.io'
+const POLYGON_URL = 'polygonscan.com'
+
+const NETWORK_TYPES_URLS = new Map([
+  ['main', ETHERSCAN_URL],
+  ['kovan', `kovan.${ETHERSCAN_URL}`],
+  ['rinkeby', `rinkeby.${ETHERSCAN_URL}`],
+  ['ropsten', `ropsten.${ETHERSCAN_URL}`],
+  ['goerli', `goerli.${ETHERSCAN_URL}`],
+  ['matic', POLYGON_URL],
+  ['mumbai', `mumbai.${POLYGON_URL}`],
+  ['harmony', `explorer.harmony.one`],
+  ['harmonyTest', `explorer.pops.one`],
 ])
-const ETHERSCAN_TYPES = new Map([
+
+const URL_TYPES = new Map([
   ['block', 'block'],
   ['transaction', 'tx'],
   ['address', 'address'],
   ['token', 'token'],
 ])
 
-const BLOCK_EXPLORERS = {
-  etherscan: ({ type, value, networkType }) => {
-    if (networkType === 'private') {
-      return ''
-    }
+function _getBlockExplorer({ type, value, networkType }) {
+  if (networkType === 'private') {
+    return ''
+  }
 
-    if (!ETHERSCAN_NETWORK_TYPES.has(networkType)) {
-      throw new Error('provider not supported.')
-    }
-    if (!ETHERSCAN_TYPES.has(type)) {
-      throw new Error('type not supported.')
-    }
+  if (!NETWORK_TYPES_URLS.has(networkType)) {
+    throw new Error('network type not supported.')
+  }
+  if (!URL_TYPES.has(type)) {
+    throw new Error('type not supported.')
+  }
 
-    const subdomain = ETHERSCAN_NETWORK_TYPES.get(networkType)
-    const typePart = ETHERSCAN_TYPES.get(type)
-    return `https://${subdomain}etherscan.io/${typePart}/${value}`
-  },
+  const subdomain = NETWORK_TYPES_URLS.get(networkType)
+  const typePart = URL_TYPES.get(type)
+  return `https://${subdomain}/${typePart}/${value}`
 }
 
 /**
@@ -155,23 +161,11 @@ export function isTransaction(transaction) {
  * @param {string} value Identifier of the object, depending on the type (block number, transaction hash, …).
  * @param {object} options The optional parameters.
  * @param {string} options.networkType The Ethereum network type (main, kovan, rinkeby, ropsten, goerli, or private).
- * @param {string} options.provider The explorer provider (e.g. etherscan).
  * @returns {string} The generated URL, or an empty string if the parameters are invalid.
  */
-export function blockExplorerUrl(
-  type,
-  value,
-  { networkType = 'main', provider = 'etherscan' } = {}
-) {
-  const explorer = BLOCK_EXPLORERS[provider]
-
-  if (!explorer) {
-    warn('blockExplorerUrl(): provider not supported.')
-    return ''
-  }
-
+export function blockExplorerUrl(type, value, { networkType = 'main' } = {}) {
   try {
-    return explorer({ type, value, networkType })
+    return _getBlockExplorer({ type, value, networkType })
   } catch (err) {
     warn(`blockExplorerUrl(): ${err.message}`)
     return ''