Skip to content

Commit

Permalink
Minor mixed fixes (#752)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
louilinn authored Oct 27, 2023
1 parent a89a78d commit c098161
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
5 changes: 2 additions & 3 deletions locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand All @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/TutorialOrganization.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions src/styles/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -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%)`,
Expand Down
2 changes: 1 addition & 1 deletion src/views/Profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit c098161

Please sign in to comment.