From c0981610593ed38fbbbcc2bac67671fbd2fd4c82 Mon Sep 17 00:00:00 2001 From: louilinn Date: Fri, 27 Oct 2023 16:55:57 +0200 Subject: [PATCH] Minor mixed fixes (#752) * Resolve issue #181 with consistent username characters allowed hint * Clearify Profile activity log name * Fix gradient in SW creation tutorial * Do not include Hey check out my profile when copying other's profile --- locales/en.json | 5 ++--- src/components/TutorialOrganization.js | 2 +- src/styles/theme.js | 1 + src/views/Profile.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/locales/en.json b/locales/en.json index e0dfb706..1a67f8b4 100644 --- a/locales/en.json +++ b/locales/en.json @@ -250,7 +250,7 @@ "bodySeedPhrase": "This is your account password. You can use this to login into your account on other devices.", "bodySeedPhraseChallenge": "Please enter word {wordIndex} in your magic words:", "bodyUsername": "Your username is how your friends can search for you on the Circles App.", - "bodyGuidelinesUsername": "Only basic characters and numbers (A-Z, 0-9) are allowed, no symbols or whitespace, 3-24 characters.", + "bodyGuidelinesUsername": "Only basic characters and numbers (a-z, A-Z, 0-9) are allowed, no symbols or whitespace, 3-24 characters.", "buttonCopyToClipboard": "Copy to clipboard", "errorSignup": "A server error occurred during sign up: {errorMessage}", "formEmail": "Email", @@ -319,7 +319,7 @@ "successAddedMember": "You've successfully added @{username} to this shared wallet." }, "Profile": { - "bodyActivity": "Activity", + "bodyActivity": "Shared Activity", "bodyNoActivities": "No activities yet.", "bodyNoMutualFriends": "No mutual trusted peers found.", "bodyStatusCommonFriends": { @@ -332,7 +332,6 @@ "bodyStatusNotDeployedYet": "This account has not yet been verified", "bodyStatusTrustingMe": "@{username} trusts you", "bodyMutuallyTrusted": "Mutually Trusted", - "shareText": "Check out my Circles UBI profile!", "tooltipSafeIsYou": "This is your own profile", "tooltipSafeNotDeployed": "This account has not yet been verified" }, diff --git a/src/components/TutorialOrganization.js b/src/components/TutorialOrganization.js index 87d0d28b..d3ac05fc 100644 --- a/src/components/TutorialOrganization.js +++ b/src/components/TutorialOrganization.js @@ -14,7 +14,7 @@ import { IconBack, IconClose } from '~/styles/icons'; const useStyles = makeStyles((theme) => ({ wrapper: { - background: theme.custom.gradients.violetCurved, + background: theme.custom.gradients.violetTutorial, }, background: { position: 'absolute', diff --git a/src/styles/theme.js b/src/styles/theme.js index 24f7551b..b679320f 100644 --- a/src/styles/theme.js +++ b/src/styles/theme.js @@ -92,6 +92,7 @@ const gradients = { greenBlueHeader: `linear-gradient(180deg, ${colors.blue100} 20%, ${colors.springGreen} 150%)`, violetCurved: `linear-gradient(180deg, ${colors.purple100} 0%, ${colors.purpleLightGrad} 33.2%)`, violetHeader: `linear-gradient(180deg, ${colors.purple100} 20%, ${colors.purpleLightGrad} 100%)`, + violetTutorial: `linear-gradient(180deg, ${colors.purpleLightGrad} 20%, ${colors.purple100} 100%)`, // Other pinkShade: `linear-gradient(180deg, rgba(255, 255, 255, 0) 75%, ${colors.pink100} 145%)`, turquoise: `linear-gradient(0deg, ${colors.green} 0%, ${colors.turquoise} 100%)`, diff --git a/src/views/Profile.js b/src/views/Profile.js index f82b0503..41d2d776 100644 --- a/src/views/Profile.js +++ b/src/views/Profile.js @@ -76,7 +76,7 @@ const Profile = () => { const safe = useSelector((state) => state.safe); const shareLink = useProfileLink(address); - const shareText = translate('Profile.shareText', { shareLink }); + const shareText = shareLink; const trustStatus = useTrustConnection(address); const deploymentStatus = useDeploymentStatus(address);