From 2b8ec8999c6038dc730280baa854ad46d906ccd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?German=20Urrustaraz=C3=BA?= Date: Thu, 21 Jul 2022 17:27:51 -0300 Subject: [PATCH 1/8] update port (#215) --- frontend/packages/client/src/networks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/packages/client/src/networks.js b/frontend/packages/client/src/networks.js index f7d5a2c53..09e4b4ea1 100644 --- a/frontend/packages/client/src/networks.js +++ b/frontend/packages/client/src/networks.js @@ -1,6 +1,6 @@ const networksConfig = { emulator: { - accessApi: process.env.REACT_APP_EMULATOR_API || 'http://localhost:8080', + accessApi: process.env.REACT_APP_EMULATOR_API || 'http://localhost:8888', walletDiscovery: process.env.REACT_APP_EMULATOR_WALLET_DISCOVERY || 'http://localhost:8701/fcl/authn', From c8d6eedc0ff2130e28f693d65e5563777ddd89f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?German=20Urrustaraz=C3=BA?= Date: Thu, 21 Jul 2022 18:29:21 -0300 Subject: [PATCH 2/8] CAS-309 - Fix address and contract validation (#216) * update addr filter * fix * update accessApi * ad check for env variable * remove output * remove output * add comment --- .../packages/client/src/hooks/useCommunity.js | 4 +- frontend/packages/client/src/networks.js | 4 +- .../client/src/pages/CommunityCreate.js | 37 +++++++++++++------ 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/frontend/packages/client/src/hooks/useCommunity.js b/frontend/packages/client/src/hooks/useCommunity.js index 886d4dbb1..74b2f1e8d 100644 --- a/frontend/packages/client/src/hooks/useCommunity.js +++ b/frontend/packages/client/src/hooks/useCommunity.js @@ -124,8 +124,8 @@ export default function useCommunity({ category: categorySelected?.value, termsAndConditionsUrl, creatorAddr, - additionalAuthors: listAddrAuthors?.map((ele) => ele.addr), - additionalAdmins: listAddrAdmins?.map((ele) => ele.addr), + additionalAuthors: listAddrAuthors, + additionalAdmins: listAddrAdmins, slug, githubUrl, instagramUrl, diff --git a/frontend/packages/client/src/networks.js b/frontend/packages/client/src/networks.js index 09e4b4ea1..14b2f2da3 100644 --- a/frontend/packages/client/src/networks.js +++ b/frontend/packages/client/src/networks.js @@ -15,7 +15,7 @@ const networksConfig = { }, }, testnet: { - accessApi: 'https://access-testnet.onflow.org', + accessApi: 'https://rest-testnet.onflow.org', walletDiscovery: 'https://fcl-discovery.onflow.org/testnet/authn', walletDiscoveryApi: 'https://fcl-discovery.onflow.org/api/testnet/authn', walletDiscoveryInclude: [ @@ -31,7 +31,7 @@ const networksConfig = { }, }, mainnet: { - accessApi: 'https://mainnet.onflow.org', + accessApi: 'https://rest-mainnet.onflow.org', walletDiscovery: 'https://fcl-discovery.onflow.org/authn', walletDiscoveryApi: 'https://fcl-discovery.onflow.org/api/authn', walletDiscoveryInclude: [ diff --git a/frontend/packages/client/src/pages/CommunityCreate.js b/frontend/packages/client/src/pages/CommunityCreate.js index ea51131ed..d9eddb0e6 100644 --- a/frontend/packages/client/src/pages/CommunityCreate.js +++ b/frontend/packages/client/src/pages/CommunityCreate.js @@ -74,31 +74,44 @@ export default function CommunityCreate() { strategies = [], } = fields; + const addrAdmins = listAddrAdmins + .map((e) => e.addr) + .filter((addr) => !!addr); + const addrAuthors = listAddrAuthors + .map((e) => e.addr) + .filter((addr) => !!addr); + // validate Flow Addresses used const addressesToValidate = { - 'Contract Address': [contractAddress], - 'Admin List': listAddrAdmins.map((e) => e.addr), - 'Author List': listAddrAuthors.map((e) => e.addr), + 'Contract Address': contractAddress ? [contractAddress] : [], + 'Admin List': addrAdmins, + 'Author List': addrAuthors, Strategies: strategies.map(({ contract }) => contract.addr), }; const validation = Object.entries(addressesToValidate); const errorMessages = []; await Promise.all( - validation.map(async (ele) => { + validation.map(async ([name, addrs]) => { try { - await Promise.all( - ele[1].map(async (addr) => { - await isValidFlowAddress(addr); - }) - ); + await Promise.all(addrs.map((addr) => isValidFlowAddress(addr))); } catch (error) { - errorMessages.push(ele[0]); + // This is to bypass error on local + // emulator when keys field is not present + // on flow emulator response + if ( + process.env.APP_ENV !== 'PRODUCTION' && + !error?.message.includes( + "Cannot read properties of undefined (reading 'map')" + ) + ) { + errorMessages.push(name); + } } }) ); // open modal if there are errors on addresses - if (errorMessages.lenght) { + if (errorMessages.length) { modalContext.openModal( React.createElement(Error, { error: ( @@ -127,6 +140,8 @@ export default function CommunityCreate() { const communityData = { creatorAddr, ...fields, + listAddrAdmins: addrAdmins, + listAddrAuthors: addrAuthors, slug: generateSlug(), }; From 4a0bf5e72410512a0a37f2f99cff159b8251b9cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?German=20Urrustaraz=C3=BA?= Date: Thu, 21 Jul 2022 19:24:32 -0300 Subject: [PATCH 3/8] CAS-314 update border on create community button (#219) * add class * remove transition * add class --- frontend/packages/client/src/App.sass | 2 +- frontend/packages/client/src/components/ActionButton.js | 2 +- .../src/components/Community/StrategyEditorModal/index.js | 2 +- .../packages/client/src/components/CommunityCreate/StepFour.js | 2 +- .../packages/client/src/components/CommunityCreate/StepOne.js | 2 +- .../packages/client/src/components/CommunityCreate/StepThree.js | 2 +- .../packages/client/src/components/CommunityCreate/StepTwo.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/packages/client/src/App.sass b/frontend/packages/client/src/App.sass index 7f4e82ed8..ed71b490e 100644 --- a/frontend/packages/client/src/App.sass +++ b/frontend/packages/client/src/App.sass @@ -154,7 +154,7 @@ code border: none !important &:hover color: black - &.vote-button:hover + &.vote-button:hover, &.has-button-border-hover:hover color: black border: 1px solid rgba(0, 0, 0, 0.4) !important .button.is-disabled diff --git a/frontend/packages/client/src/components/ActionButton.js b/frontend/packages/client/src/components/ActionButton.js index 32c7c64ad..3cd464f3d 100644 --- a/frontend/packages/client/src/components/ActionButton.js +++ b/frontend/packages/client/src/components/ActionButton.js @@ -10,7 +10,7 @@ export default function ActionButton({ classNames, } = {}) { const clNames = classnames( - 'button transition-all is-flex is-align-items-centered rounded-sm is-uppercase', + 'button is-flex is-align-items-centered rounded-sm is-uppercase', 'm-0 p-0', 'has-background-yellow', { 'is-enabled': enabled }, diff --git a/frontend/packages/client/src/components/Community/StrategyEditorModal/index.js b/frontend/packages/client/src/components/Community/StrategyEditorModal/index.js index 5c6d25cb2..23499cda3 100644 --- a/frontend/packages/client/src/components/Community/StrategyEditorModal/index.js +++ b/frontend/packages/client/src/components/Community/StrategyEditorModal/index.js @@ -145,7 +145,7 @@ export default function StrategyEditorModal({ label="done" enabled={formIsValid} onClick={onConfirmDone} - classNames="mt-5" + classNames="mt-5 has-button-border-hover" /> } /> diff --git a/frontend/packages/client/src/components/CommunityCreate/StepFour.js b/frontend/packages/client/src/components/CommunityCreate/StepFour.js index b2b1315f0..c3c17bc8b 100644 --- a/frontend/packages/client/src/components/CommunityCreate/StepFour.js +++ b/frontend/packages/client/src/components/CommunityCreate/StepFour.js @@ -33,7 +33,7 @@ export default function StepFour({ label="CREATE COMMUNITY" enabled={isStepValid} onClick={isStepValid ? () => onSubmit() : () => {}} - classNames="mt-5" + classNames="mt-5 has-button-border-hover" /> ); }} diff --git a/frontend/packages/client/src/components/CommunityCreate/StepOne.js b/frontend/packages/client/src/components/CommunityCreate/StepOne.js index b454c079f..2ea9ae0ff 100644 --- a/frontend/packages/client/src/components/CommunityCreate/StepOne.js +++ b/frontend/packages/client/src/components/CommunityCreate/StepOne.js @@ -271,7 +271,7 @@ export default function StepOne({