From b511e188d8089c3636a13a4488e276d8fc9b5775 Mon Sep 17 00:00:00 2001 From: aeddaqqa Date: Tue, 24 Sep 2024 12:34:12 +0100 Subject: [PATCH 1/2] fix(partnerConfig): fix typo --- src/views/partners/Configuration.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/partners/Configuration.tsx b/src/views/partners/Configuration.tsx index 0b60567b..192e9919 100644 --- a/src/views/partners/Configuration.tsx +++ b/src/views/partners/Configuration.tsx @@ -110,7 +110,7 @@ const Content = () => { )} {!store.getters['Accounts/kycStatus'] && ( From 22cfab2dc43535ac3ffa310ad936f51980106f93 Mon Sep 17 00:00:00 2001 From: aeddaqqa Date: Wed, 25 Sep 2024 01:35:35 +0100 Subject: [PATCH 2/2] fix(partnerConfig): small adjustment to infos and matching email body --- .../Partners/UpdatedSelectComponent.tsx | 2 +- src/layout/PartnersLayout.tsx | 5 +- src/views/partners/ManageBots.tsx | 2 +- src/views/partners/MyMessenger.tsx | 71 ++++++++++++++----- src/views/partners/Partner.tsx | 23 ++++-- 5 files changed, 73 insertions(+), 30 deletions(-) diff --git a/src/components/Partners/UpdatedSelectComponent.tsx b/src/components/Partners/UpdatedSelectComponent.tsx index 19e6e9ef..b999e444 100644 --- a/src/components/Partners/UpdatedSelectComponent.tsx +++ b/src/components/Partners/UpdatedSelectComponent.tsx @@ -32,7 +32,7 @@ const UpdatedSelectComponent = React.memo( name: service, fee: '0', capabilities: [''], - rackRates: true, + rackRates: false, }, }, }) diff --git a/src/layout/PartnersLayout.tsx b/src/layout/PartnersLayout.tsx index a5d0bca8..428a9203 100644 --- a/src/layout/PartnersLayout.tsx +++ b/src/layout/PartnersLayout.tsx @@ -15,8 +15,9 @@ import Links from '../views/settings/Links' const ClaimProfile = () => { const generateEmail = () => { const subject = 'Claim a Partner' - const body = `This is to claim a Partner record and associate it to the wallet with C-Chain address .Please add your name, contact details, the Partner name, and attach any evidence of your affiliation with the Partner.` - + const body = `This is to claim a Partner record and associate it to the wallet with C-Chain address ${ + '0x' + store.state.activeWallet.ethAddress + }. Please add your name, contact details, the Partner name, and attach any evidence of your affiliation with the Partner.` const mailtoLink = `mailto:${emailAddress}?subject=${encodeURIComponent( subject, )}&body=${encodeURIComponent(body)}` diff --git a/src/views/partners/ManageBots.tsx b/src/views/partners/ManageBots.tsx index 5a1666b1..45e4d584 100644 --- a/src/views/partners/ManageBots.tsx +++ b/src/views/partners/ManageBots.tsx @@ -334,7 +334,7 @@ const ManageBots = () => { - + ) diff --git a/src/views/partners/MyMessenger.tsx b/src/views/partners/MyMessenger.tsx index 877f5f81..0790db29 100644 --- a/src/views/partners/MyMessenger.tsx +++ b/src/views/partners/MyMessenger.tsx @@ -431,9 +431,6 @@ const MyMessenger = () => { {partner?.attributes?.companyName} Messenger Account - First you need to top up the CM Account with CAM, EURSH or USDC to work - properly. Transfer it to the newly generated CM address below. -
In this page you are able to display and copy your Camino Messenger address, and manage accepted currencies. @@ -591,14 +588,23 @@ const MyMessenger = () => { control={ theme.palette.secondary.main, + m: '0 8px 0 0', + color: theme => + !isEditMode + ? theme.palette.action.disabled + : theme.palette.secondary.main, '&.Mui-checked': { - color: theme => theme.palette.secondary.main, + color: theme => + !isEditMode + ? theme.palette.action.disabled + : theme.palette.secondary.main, }, '&.MuiCheckbox-colorSecondary.Mui-checked': { - color: theme => theme.palette.secondary.main, + color: theme => + !isEditMode + ? theme.palette.action.disabled + : theme.palette.secondary.main, }, - m: '0 8px 0 0', }} checked={ isEditMode @@ -629,14 +635,23 @@ const MyMessenger = () => { control={ theme.palette.secondary.main, + m: '0 8px 0 0', + color: theme => + !isEditMode + ? theme.palette.action.disabled + : theme.palette.secondary.main, '&.Mui-checked': { - color: theme => theme.palette.secondary.main, + color: theme => + !isEditMode + ? theme.palette.action.disabled + : theme.palette.secondary.main, }, '&.MuiCheckbox-colorSecondary.Mui-checked': { - color: theme => theme.palette.secondary.main, + color: theme => + !isEditMode + ? theme.palette.action.disabled + : theme.palette.secondary.main, }, - m: '0 8px 0 0', }} checked={isEditMode ? tempCAMSupported : isCAMSupported} onChange={e => setTempCAMSupported(e.target.checked)} @@ -665,14 +680,23 @@ const MyMessenger = () => { control={ theme.palette.secondary.main, + m: '0 8px 0 0', + color: theme => + true + ? theme.palette.action.disabled + : theme.palette.secondary.main, '&.Mui-checked': { - color: theme => theme.palette.secondary.main, + color: theme => + true + ? theme.palette.action.disabled + : theme.palette.secondary.main, }, '&.MuiCheckbox-colorSecondary.Mui-checked': { - color: theme => theme.palette.secondary.main, + color: theme => + true + ? theme.palette.action.disabled + : theme.palette.secondary.main, }, - m: '0 8px 0 0', }} checked={false} /> @@ -698,14 +722,23 @@ const MyMessenger = () => { control={ theme.palette.secondary.main, + m: '0 8px 0 0', + color: theme => + true + ? theme.palette.action.disabled + : theme.palette.secondary.main, '&.Mui-checked': { - color: theme => theme.palette.secondary.main, + color: theme => + true + ? theme.palette.action.disabled + : theme.palette.secondary.main, }, '&.MuiCheckbox-colorSecondary.Mui-checked': { - color: theme => theme.palette.secondary.main, + color: theme => + true + ? theme.palette.action.disabled + : theme.palette.secondary.main, }, - m: '0 8px 0 0', }} checked={false} /> diff --git a/src/views/partners/Partner.tsx b/src/views/partners/Partner.tsx index 524fdd30..2c2bb537 100644 --- a/src/views/partners/Partner.tsx +++ b/src/views/partners/Partner.tsx @@ -170,7 +170,21 @@ const Widget = ({ if (data.supportedCurrencies && data.supportedCurrencies.offChainPaymentSupported) myPartnerAccept.push('offChainPaymentSupported') const subject = 'Connect on Camino Messenger' - const body = ` + let bodyEnding = match + ? ` + + Offered and/or wanted services by you combine with what we look for and offer on Camino Network: we can easily connect via the Messenger. + + Please get in touch at your convenience to discuss a connection on Camino Messenger. + + Best Regards` + : ` + + Please get in touch at your convenience to discuss a connection on Camino Messenger. + + Best Regards` + const body = + ` Dear Sirs, we are both on Camino Messenger. @@ -185,12 +199,7 @@ const Widget = ({ Offer: ${supportedServiceTypes} Want: ${wantedServiceTypes} Accept: ${myPartnerAccept} - Messenger Address: ${value?.contractCMAccountAddress} - - Please get in touch at your convenience to discuss a connection on Camino Messenger. - - Best Regards - ` + Messenger Address: ${value?.contractCMAccountAddress}` + bodyEnding const mailtoLink = `mailto:${ partner.attributes.contactEmail