Remove migration

locales/en.json

@@ -202,23 +202,8 @@
     "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.",
-    "migrationText2": "Please login and visit the Migrate Your Profile page to confirm your preference",
-    "migrationText3": "Please visit the <a href='{env}/profile-migrate' rel='noopener noreferrer'>Migrate Your Profile</a> page to confirm your preference"
-  },
-  "MigrateYourProfile": {
-    "title": "Migrate Your Profile",
-    "body1": "If you accept the migration of your user profile, this will mean that your data will be transferred to the new Circles team (Gnosis Chain).",
-    "body2": "At the end of the migration period, all the data that is not transferred will be deleted from current databases.",
-    "body3": "Your wallet, seed phrase, and CRC will not be deleted regardless of your choice and you will still be able to access to your wallet via circles.garden.",
-    "labelForm": "Do you consent to the migration of your profile data to the new Circles team?",
-    "option1": "Yes",
-    "option2": "no",
-    "buttonSubmit": "Submit",
-    "confirmationMsg": "You have successfully updated your migration data status",
-    "errorMsg": "Sorry, there was a problem with saving changes."
+    "ShortMsgText": "Circles V2 is launching soon. Join our Discord for live updates"
   },
   "MyProfile": {
     "buttonCreateOrganization": "Create Shared Wallet",
@@ -234,7 +219,6 @@
     "buttonDoublePeople": "Trust People",
     "buttonSendCircles": "Send Circles",
     "buttonOrganization": "Create Shared Wallet",
-    "buttonMigration": "Migrate Your Profile",
     "linkAbout": "About",
     "linkBugReporting": "Report Bugs",
     "linkFAQ": "FAQ",

src/components/Navigation.js

@@ -8,7 +8,6 @@ import { generatePath } from 'react-router-dom';
 
 import {
   ACTIVITIES_PATH,
-  MIGRATION_PATH,
   MY_PROFILE_PATH,
   ORGANIZATION_PATH,
   SEARCH_PATH,
@@ -152,9 +151,6 @@ const NavigationMain = ({ onClick }) => {
       <NavigationLink to={SETTINGS_PATH} onClick={onClick}>
         {translate('Navigation.buttonSettings')}
       </NavigationLink>
-      <NavigationLink to={MIGRATION_PATH} onClick={onClick}>
-        {translate('Navigation.buttonMigration')}
-      </NavigationLink>
     </Box>
   );
 };

src/components/NavigationFloating.js

@@ -6,7 +6,6 @@ import { Link } from 'react-router-dom';
 
 import {
   EDIT_PROFILE_PATH,
-  MIGRATION_PATH,
   MY_PROFILE_PATH,
   ORGANIZATION_MEMBERS_PATH,
 } from '~/routes';
@@ -188,11 +187,6 @@ export default function NavigationFloating(props) {
         }}
         onClose={handleClose}
       >
-        <MenuItem onClick={handleClose}>
-          <Link to={MIGRATION_PATH}>
-            <Button isOutline>{translate('Navigation.buttonMigration')}</Button>
-          </Link>
-        </MenuItem>
         {props.isAddMembersLink && (
           <MenuItem onClick={handleClose}>
             <Link to={ORGANIZATION_MEMBERS_PATH}>

src/components/ShortMessage.js

@@ -0,0 +1,34 @@
+import { Box, Typography } from '@mui/material';
+import makeStyles from '@mui/styles/makeStyles';
+import React from 'react';
+
+import ExternalLink from '~/components/ExternalLink';
+import translate from '~/services/locale';
+import { DISCORD_URL } from '~/utils/constants';
+
+const useStyles = makeStyles(() => ({
+  messageContainer: {
+    marginTop: '10px',
+    '& p': {
+      marginBottom: '10px',
+    },
+    textAlign: 'center',
+  },
+}));
+
+const ShortMessage = () => {
+  const classes = useStyles();
+
+  return (
+    <Box className={classes.messageContainer}>
+      <Typography align="center" variant="body1">
+        {translate('Login.ShortMsgText')}
+      </Typography>
+      <ExternalLink href={DISCORD_URL} variant="body2">
+        {DISCORD_URL}
+      </ExternalLink>
+    </Box>
+  );
+};
+
+export default ShortMessage;

src/routes.js

@@ -10,7 +10,6 @@ import DashboardOrganization from '~/views/DashboardOrganization';
 import EditProfile from '~/views/EditProfile';
 import Error from '~/views/Error';
 import Login from '~/views/Login';
-import MigrateYourProfile from '~/views/MigrateYourProfile';
 import NotFound from '~/views/NotFound';
 import Onboarding from '~/views/Onboarding';
 import OnboardingOrganization from '~/views/OnboardingOrganization';
@@ -38,7 +37,6 @@ export const ACTIVITIES_PATH = '/activities';
 export const DASHBOARD_PATH = '/';
 export const EDIT_PROFILE_PATH = '/edit';
 export const LOGIN_PATH = '/welcome/login';
-export const MIGRATION_PATH = '/profile-migrate';
 export const ONBOARDING_PATH = '/welcome/onboarding';
 export const ORGANIZATION_MEMBERS_ADD_PATH = '/sharedwallet/members/add';
 export const ORGANIZATION_MEMBERS_PATH = '/sharedwallet/members';
@@ -266,11 +264,6 @@ const Routes = () => {
       <TrustedRoute component={Share} exact path={SHARE_PATH} />
       <TrustedRoute component={Profile} exact path={PROFILE_PATH} />
       <TrustedRoute component={Activities} exact path={ACTIVITIES_PATH} />
-      <TrustedRoute
-        component={MigrateYourProfile}
-        exact
-        path={MIGRATION_PATH}
-      />
       <TrustedRoute component={EditProfile} exact path={EDIT_PROFILE_PATH} />
       <TrustedRoute component={QRGenerator} exact path={QR_GENERATOR_PATH} />
       <TrustedRoute component={Search} exact path={SEARCH_PATH} />

src/services/core.js

@@ -145,22 +145,6 @@ const user = {
       safeAddress,
     });
   },
-
-  updateProfileMigrationConsent: async (
-    safeAddress,
-    profileMigrationConsent,
-  ) => {
-    return await requestCore('user', 'updateProfileMigrationConsent', {
-      safeAddress,
-      profileMigrationConsent,
-    });
-  },
-
-  getProfileMigrationConsent: async (safeAddress) => {
-    return await requestCore('user', 'getProfileMigrationConsent', {
-      safeAddress,
-    });
-  },
 };
 
 const avatar = {

src/store/app/actions.js

@@ -20,7 +20,6 @@ import {
   initializeTutorials,
   resetAllTutorials,
 } from '~/store/tutorial/actions';
-import { initializeUser } from '~/store/user/actions';
 import { burnWallet, initializeWallet } from '~/store/wallet/actions';
 import { formatErrorMessage } from '~/utils/debug';
 
@@ -37,9 +36,6 @@ export function initializeApp() {
 
     dispatch(showSpinnerOverlay());
 
-    // Check for migration status
-    dispatch(initializeUser());
-
     // Initialize and gather important app states (auth etc.)
     try {
       await dispatch(initializeTutorials());

src/store/index.js

@@ -7,7 +7,6 @@ import safeReducer from '~/store/safe/reducers';
 import tokenReducer from '~/store/token/reducers';
 import trustReducer from '~/store/trust/reducers';
 import tutorialReducer from '~/store/tutorial/reducers';
-import userReducer from '~/store/user/reducers';
 import walletReducer from '~/store/wallet/reducers';
 
 const rootReducer = combineReducers({
@@ -18,7 +17,6 @@ const rootReducer = combineReducers({
   token: tokenReducer,
   trust: trustReducer,
   tutorial: tutorialReducer,
-  user: userReducer,
   wallet: walletReducer,
 });
 

src/styles/theme.js

@@ -425,7 +425,7 @@ export default createTheme({
     scrollShadow: 30,
     layer2: 20,
     layer1: 10,
-    backgroundCurvedWrapper: -1, // previously 0, changing so migration link is clickable
+    backgroundCurvedWrapper: -1, // previously 0, changing so short message link in dashboard is clickable
   },
   custom: {
     colors,

src/utils/constants.js

@@ -6,6 +6,7 @@ export const NEEDED_TRUST_CONNECTIONS = 1;
 
 export const ABOUT_URL = 'https://www.aboutcircles.com';
 export const BUG_REPORTING_URL = 'mailto:support@aboutcircles.com';
+export const DISCORD_URL = 'https://discord.com/invite/aboutcircles';
 export const EMAIL_URL = 'mailto:hello@aboutcircles.com';
 export const FACEBOOK_URL = 'https://facebook.com/CirclesUBI';
 export const FAQ_URL = 'https://www.aboutcircles.com/faq';

src/views/Dashboard.js

@@ -1,4 +1,4 @@
-import { Box, Container, Grid, IconButton, Typography } from '@mui/material';
+import { Box, Container, Grid, IconButton } from '@mui/material';
 import makeStyles from '@mui/styles/makeStyles';
 import clsx from 'clsx';
 import React, { Fragment, useEffect, useState } from 'react';
@@ -19,6 +19,7 @@ import Header from '~/components/Header';
 import LastInteractions from '~/components/LastInteractions';
 import Navigation from '~/components/Navigation';
 import NavigationFloating from '~/components/NavigationFloating';
+import ShortMessage from '~/components/ShortMessage';
 import View from '~/components/View';
 import { useUpdateLoop } from '~/hooks/update';
 import translate from '~/services/locale';
@@ -83,6 +84,7 @@ const useStyles = makeStyles((theme) => ({
     '& p': {
       marginBottom: '10px',
     },
+    textAlign: 'center',
   },
 }));
 
@@ -117,17 +119,6 @@ const Dashboard = () => {
     setIsMenuExpanded(false);
   };
 
-  const env = process.env.BASE_PATH;
-  const htmlMigrationContent = (
-    <span
-      dangerouslySetInnerHTML={{
-        __html: translate('Login.migrationText3', {
-          env,
-        }),
-      }}
-    />
-  );
-
   return (
     <Fragment>
       <BackgroundCurved gradient="turquoise">
@@ -166,18 +157,7 @@ const Dashboard = () => {
           <Box className={classes.balanceContainer}>
             <BalanceDisplay />
           </Box>
-          <Box className={classes.migrationContainer}>
-            <Typography align="center" variant="body1">
-              {translate('Login.migrationText1')}
-            </Typography>
-            <Typography
-              align="center"
-              classes={{ root: 'body3_link_gradient' }}
-              variant="body1"
-            >
-              {htmlMigrationContent}
-            </Typography>
-          </Box>
+          <ShortMessage />
           <AppNote messageVersion="dashboard" />
           <Grid item xs={12}>
             <ButtonDouble