Merge main branch #17

danimesq · 2021-10-24T19:01:51Z

No description provided.

Update wrapper version and network configuration

Network change: Update defaultEth node

…everything <3

Merge upstream

This reverts commit b6ea8ae.

Merge lidofinance/aragon-client

my Ubuntu's emoji pack is either homophobic or outdated

hound · 2021-10-24T19:01:54Z

src/aragonjs-wrapper.js

@@ -4,7 +4,7 @@ import Aragon, {
  ensResolve,
  getRecommendedGasLimit,
  providers,
-} from '@aragon/wrapper'
+} from '@1hive/wrapper'


Missing semicolon.

hound · 2021-10-24T19:01:54Z

src/aragonjs-wrapper.js

@@ -4,7 +4,7 @@ import Aragon, {
  ensResolve,
  getRecommendedGasLimit,
  providers,
-} from '@aragon/wrapper'
+} from '@1hive/wrapper'


Missing semicolon.

hound · 2021-10-24T19:01:54Z

src/ethereum-providers/index.js

@@ -7,6 +7,7 @@ import status from './icons/Status.png'
 import wallet from './icons/wallet.svg'
 import fortmatic from './icons/Fortmatic.svg'
 import portis from './icons/Portis.svg'
+import walletconnect from './icons/WalletConnect.svg'


'import' is only available in ES6 (use 'esversion: 6').
Missing semicolon.

hound · 2021-10-24T19:01:55Z

src/known-organizations/index.js

+import lidoImage from './images/lido.svg'
+import gamlrImage from './images/gamlr.png'
+import plasmmerImage from './images/plasmmer.jpg'
+import AragonChinaImage from './images/aragonchina.png'


'import' is only available in ES6 (use 'esversion: 6').
Missing semicolon.
Too many errors. (7% scanned).

hound · 2021-10-24T19:01:55Z

src/known-organizations/index.js

@@ -19,6 +19,12 @@ import pNetworkImage from './images/pnetwork.png'
 import cryptokekImage from './images/cryptokek.svg'
 import nucypherDaoImage from './images/nucypher.svg'
 import nucypherIbexImage from './images/nucypher-ibex.png'
+import lidoImage from './images/lido.svg'
+import gamlrImage from './images/gamlr.png'
+import plasmmerImage from './images/plasmmer.jpg'


'import' is only available in ES6 (use 'esversion: 6').
Missing semicolon.

hound · 2021-10-24T19:01:55Z

src/known-organizations/index.js

@@ -19,6 +19,12 @@ import pNetworkImage from './images/pnetwork.png'
 import cryptokekImage from './images/cryptokek.svg'
 import nucypherDaoImage from './images/nucypher.svg'
 import nucypherIbexImage from './images/nucypher-ibex.png'
+import lidoImage from './images/lido.svg'
+import gamlrImage from './images/gamlr.png'


'import' is only available in ES6 (use 'esversion: 6').
Missing semicolon.

hound · 2021-10-24T19:01:56Z

src/known-organizations/index.js

@@ -19,6 +19,12 @@ import pNetworkImage from './images/pnetwork.png'
 import cryptokekImage from './images/cryptokek.svg'
 import nucypherDaoImage from './images/nucypher.svg'
 import nucypherIbexImage from './images/nucypher-ibex.png'
+import lidoImage from './images/lido.svg'


'import' is only available in ES6 (use 'esversion: 6').
Missing semicolon.

hound · 2021-10-24T19:01:56Z

src/local-settings.js

@@ -12,6 +12,7 @@ const SELECTED_CURRENCY = 'SELECTED_CURRENCY'
 const SENTRY_DSN = 'SENTRY_DSN'
 const PORTIS_DAPP_ID = 'PORTIS_DAPP_ID'
 const FORTMATIC_API_KEY = 'FORTMATIC_API_KEY'
+const WALLETCONNECT_RPC_URL = 'WALLETCONNECT_RPC_URL'


'const' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).
Missing semicolon.

hound · 2021-10-24T19:01:57Z

src/onboarding/Welcome/Welcome.js

@@ -24,16 +26,21 @@ const Welcome = React.memo(function Welcome({

  const selectorNetworksSorted = useMemo(() => {
    return selectorNetworks
-      .map(([type, name, url]) => ({ type, name, url }))
+      .map(([chainId, type, name, url]) => ({ chainId, type, name, url }))


'arrow function syntax (=>)' is only available in ES6 (use 'esversion: 6').
'destructuring binding' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).
'object short notation' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).

hound · 2021-10-24T19:01:57Z

src/onboarding/Welcome/Welcome.js


 import actionCreate from './assets/action-create.png'
 import actionOpen from './assets/action-open.png'
+import { getNetworkConfig } from '../../network-config'


'import' is only available in ES6 (use 'esversion: 6').
Missing semicolon.

hound · 2021-10-24T19:01:57Z

src/onboarding/Welcome/Welcome.js

@@ -7,9 +7,11 @@ import Header from '../Header/Header'
 import OpenOrg from './OpenOrg'
 import Suggestions from './Suggestions'
 import WelcomeAction from './WelcomeAction'
+import { setDefaultEthNode, setEthNetworkType } from '../../local-settings'


'import' is only available in ES6 (use 'esversion: 6').
Missing semicolon.

hound · 2021-10-24T19:01:57Z

src/prop-types.js

@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types'
-import Aragon from '@aragon/wrapper'
+import Aragon from '@1hive/wrapper'


'import' is only available in ES6 (use 'esversion: 6').
Missing semicolon.

hound · 2021-10-24T19:01:57Z

src/wallet.js

@@ -6,6 +6,7 @@ import { getFortmaticApiKey, getPortisDappId } from './local-settings'
 import { getProviderFromUseWalletId } from './ethereum-providers'
 import { network } from './environment'
 import { getWeb3, filterBalanceValue } from './web3-utils'
+import { getWalletConnectRPC } from './network-config'


'import' is only available in ES6 (use 'esversion: 6').
Missing semicolon.

skozin and others added 30 commits November 10, 2020 23:01

Network: support Göerli testnet

29506c2

add walletconnect wallet

b532c3b

lido in recommended

8b314e3

no sourcemaps

ea204f8

fix mainnet config

953a0f8

docker

6cbb5fc

fix

ba19559

build scripts, fixes

44a77f8

fix

d54a57a

Fix mainnet script

6d39bd4

Merge branch 'walletconnect'

f66e5b2

Merge branch 'goerli-testnet'

466e94b

feat: add göerli testnet support

5cb0e2d

fix: remove intercom

b6ea8ae

Update wrapper version and network configuration

d8be4ec

Merge pull request #7 from 1Hive/wrapper-and-network

1ac553f

Update wrapper version and network configuration

Add support for Polygon network

b006b2d

Update network-config.js

ac15347

Update App.js

4e675a6

Update App.js

c1f75d4

Merge pull request #17 from 1Hive/polygon

825c8c9

Network change: Save in local settings

3a789de

Network config: Set xdai and polygon correct network type

f682766

Fix lint

b26f805

Merge pull request #18 from 1Hive/multi-chain-support

d8da9e9

App: Add chainId to selector networks

65872e6

Networks: Rollback network type change

0ecc931

Merge pull request #19 from 1Hive/rollback-network-type

0700536

Network change: Update defualtEth node

b17636e

Merge pull request #20 from 1Hive/update-defaulteth-node

2f63978

Network change: Update defaultEth node

danimesq added 18 commits July 12, 2021 13:40

Stop redirecting to www hosted clients when this local client can do …

e03d4ad

…everything <3

Refresh app when choosing network. FULLY FIXED! 💞

36875fc

Merge pull request #2 from aragon/master

fe6d561

Merge upstream

Revert "fix: remove intercom"

1332405

This reverts commit b6ea8ae.

Merge branch 'master' into tmp-remove

efd8477

Merge pull request #4 from DaniellMesquita/tmp-remove

40b91dc

Merge lidofinance/aragon-client

Add XDai recommended DAOs

e1b332e

Fix issues on goerli network; now the girly is fully implemented 👩‍👩‍👧‍👦

bc4092a

my Ubuntu's emoji pack is either homophobic or outdated

Move Aragon China to Mainnet

b41321a

add comment on networkselector, about how it works

a4099a3

Add WalletConnect to goerli networ

0726918

fix known-organizations

ca42ef7

fix #8 - 'Isn't loading recommended DAOs on XDai'

ef243d6

complement previous commit

f8e2e7c

fix App.js

535e4c9

add .cdapp manifest as Altaica/Floflis app

d702598

fix

b163145

New URL for aragon.cdapp

6d0e3cc

danimesq added the enhancement New feature or request label Oct 24, 2021

danimesq self-assigned this Oct 24, 2021

hound bot reviewed Oct 24, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge main branch #17

Merge main branch #17

danimesq commented Oct 24, 2021

hound bot Oct 24, 2021

hound bot Oct 24, 2021

hound bot Oct 24, 2021

hound bot Oct 24, 2021

hound bot Oct 24, 2021

hound bot Oct 24, 2021

hound bot Oct 24, 2021

hound bot Oct 24, 2021

hound bot Oct 24, 2021

hound bot Oct 24, 2021

hound bot Oct 24, 2021

hound bot Oct 24, 2021

hound bot Oct 24, 2021

Merge main branch #17

Are you sure you want to change the base?

Merge main branch #17

Conversation

danimesq commented Oct 24, 2021

hound bot Oct 24, 2021

Choose a reason for hiding this comment

hound bot Oct 24, 2021

Choose a reason for hiding this comment

hound bot Oct 24, 2021

Choose a reason for hiding this comment

hound bot Oct 24, 2021

Choose a reason for hiding this comment

hound bot Oct 24, 2021

Choose a reason for hiding this comment

hound bot Oct 24, 2021

Choose a reason for hiding this comment

hound bot Oct 24, 2021

Choose a reason for hiding this comment

hound bot Oct 24, 2021

Choose a reason for hiding this comment

hound bot Oct 24, 2021

Choose a reason for hiding this comment

hound bot Oct 24, 2021

Choose a reason for hiding this comment

hound bot Oct 24, 2021

Choose a reason for hiding this comment

hound bot Oct 24, 2021

Choose a reason for hiding this comment

hound bot Oct 24, 2021

Choose a reason for hiding this comment