Skip to content

Commit

Permalink
Merge pull request #241 from chain4travel/aeddaqqa/partner-config-fixes
Browse files Browse the repository at this point in the history 
UI and Text Updates Across Multiple Pages
  • Loading branch information
@aeddaqqa
aeddaqqa authored Sep 25, 2024
2 parents 2c9a8c2 + 22cfab2 commit 92511ab
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 31 deletions.
2 changes: 1 addition & 1 deletion src/components/Partners/UpdatedSelectComponent.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const UpdatedSelectComponent = React.memo(
name: service,
fee: '0',
capabilities: [''],
rackRates: true,
rackRates: false,
},
},
})
Expand Down
5 changes: 3 additions & 2 deletions src/layout/PartnersLayout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)}`
Expand Down
2 changes: 1 addition & 1 deletion src/views/partners/Configuration.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const Content = () => {
<Alert
sx={{ maxWidth: 'none', width: 'fit-content' }}
variant="negative"
content="The wallet does not have sufficient funds."
content="The wallet does not have sufficient funds on C-Chain."
/>
)}
{!store.getters['Accounts/kycStatus'] && (
Expand Down
2 changes: 1 addition & 1 deletion src/views/partners/ManageBots.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ const ManageBots = () => {
</Box>
</Configuration>
<Box sx={{ display: 'flex', flexDirection: 'column', gap: '16px' }}>
<Configuration.Infos information="Check with your IT departments for the C-Chain addresses of each bots, and keep the list updated in case of changes."></Configuration.Infos>
<Configuration.Infos information="Check with your IT departments for the C-Chain address of each bot, and keep the list updated in case of changes."></Configuration.Infos>
</Box>
</Box>
)
Expand Down
71 changes: 52 additions & 19 deletions src/views/partners/MyMessenger.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,9 +431,6 @@ const MyMessenger = () => {
{partner?.attributes?.companyName} Messenger Account
</Configuration.Title>
<Configuration.Paragraphe>
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.
<br />
In this page you are able to display and copy your Camino Messenger address,
and manage accepted currencies.
</Configuration.Paragraphe>
Expand Down Expand Up @@ -591,14 +588,23 @@ const MyMessenger = () => {
control={
<Checkbox
sx={{
color: theme => 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
Expand Down Expand Up @@ -629,14 +635,23 @@ const MyMessenger = () => {
control={
<Checkbox
sx={{
color: theme => 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)}
Expand Down Expand Up @@ -665,14 +680,23 @@ const MyMessenger = () => {
control={
<Checkbox
sx={{
color: theme => 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}
/>
Expand All @@ -698,14 +722,23 @@ const MyMessenger = () => {
control={
<Checkbox
sx={{
color: theme => 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}
/>
Expand Down
23 changes: 16 additions & 7 deletions src/views/partners/Partner.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down

0 comments on commit 92511ab

Please sign in to comment.