diff --git a/locales/en.json b/locales/en.json index 08588278..5f168a19 100644 --- a/locales/en.json +++ b/locales/en.json @@ -202,10 +202,11 @@ "headingLogin": "Login", "inputPlaceholder": "Start typing...", "linkSupport": "Send an email", + "linkMigrationText": "Migrate Your Profile", "successWelcome": "Successfully connected to account. Welcome!", "migrationText1": "Circles Garden profile data is being migrated. You can read about this here:", - "migrationText2": "Please login and visit the 'profile-migrate' page to confirm your preference", - "migrationText3": "Please visit the 'profile-migrate' page to confirm your preference" + "migrationText2": "Please login and visit the Migrate Your Profile page to confirm your preference", + "migrationText3": "Please visit the Migrate Your Profile page to confirm your preference" }, "MigrateYourProfile": { "title": "Migrate Your Profile", diff --git a/src/styles/theme.js b/src/styles/theme.js index b53f6937..5cf151bc 100644 --- a/src/styles/theme.js +++ b/src/styles/theme.js @@ -227,6 +227,21 @@ export default createTheme({ color: colors.white, fontWeight: fontWeightMedium, }, + '&.body3_link_gradient': { + '& a': { + lineHeight: '120%', + background: gradients.pinkToPurple, + backgroundClip: 'text', + textFillColor: 'transparent', + textDecorationLine: 'none', + fontWeight: 600, + '&:hover': { + background: gradients.purpleToLightPink, + backgroundClip: 'text', + textFillColor: 'transparent', + }, + }, + }, }, body2: { fontWeight: fontWeightBold, diff --git a/src/views/Dashboard.js b/src/views/Dashboard.js index c44a20ba..56cf1a1e 100644 --- a/src/views/Dashboard.js +++ b/src/views/Dashboard.js @@ -119,6 +119,17 @@ const Dashboard = () => { setIsMenuExpanded(false); }; + const env = process.env.BASE_PATH; + const htmlMigrationContent = ( + + ); + return ( @@ -169,8 +180,12 @@ const Dashboard = () => { {MIGRATION_INFO_URL} - - {translate('Login.migrationText3')} + + {htmlMigrationContent} diff --git a/src/views/MigrateYourProfile.js b/src/views/MigrateYourProfile.js index 7bedc8c5..7bf12d0e 100644 --- a/src/views/MigrateYourProfile.js +++ b/src/views/MigrateYourProfile.js @@ -50,14 +50,14 @@ const MigrateYourProfile = () => { const user = useSelector((state) => state.user); const isMigrationAccepted = user?.isMigrationAccepted; - useEffect(async () => { + useEffect(() => { if (isMigrationAccepted !== undefined && isMigrationAccepted !== null) { setIsMigrateData(isMigrationAccepted); setIsLoading(false); } else { dispatch(initializeUser()); } - }, [isMigrationAccepted]); + }, [isMigrationAccepted]); // eslint-disable-line react-hooks/exhaustive-deps const handleOnChangeRadio = (event) => { setIsMigrateData(event.target.value === 'true');