Change BackgroundCurved zIndex so migration link is clickable on dash…

…board Add migration data functionality
CirclesUBI · Jul 3, 2024 · 740db18 · 740db18
1 parent b2a010c
commit 740db18
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/src/store/app/actions.js b/src/store/app/actions.js
@@ -37,6 +37,9 @@ export function initializeApp() {
 
     dispatch(showSpinnerOverlay());
 
+    // Check for migration status
+    dispatch(initializeUser());
+
     // Initialize and gather important app states (auth etc.)
     try {
       await dispatch(initializeTutorials());
@@ -53,9 +56,6 @@ export function initializeApp() {
       // Check for additional states ...
       await dispatch(checkAppState());
 
-      // Check for migration status
-      await dispatch(initializeUser());
-
       dispatch({
         type: ActionTypes.APP_INITIALIZE_SUCCESS,
       });

diff --git a/src/store/user/reducers.js b/src/store/user/reducers.js
@@ -3,7 +3,7 @@ import update from 'immutability-helper';
 import ActionTypes from '~/store/user/types';
 
 const initialState = {
-  isMigrationAccepted: false,
+  isMigrationAccepted: null,
 };
 
 const userReducer = (state = initialState, action) => {

diff --git a/src/styles/theme.js b/src/styles/theme.js
@@ -410,7 +410,7 @@ export default createTheme({
     scrollShadow: 30,
     layer2: 20,
     layer1: 10,
-    backgroundCurvedWrapper: 0,
+    backgroundCurvedWrapper: -1, // previously 0, changing so migration link is clickable
   },
   custom: {
     colors,

diff --git a/src/views/MigrateYourProfile.js b/src/views/MigrateYourProfile.js
@@ -20,7 +20,7 @@ import Footer from '~/components/Footer';
 import Header from '~/components/Header';
 import View from '~/components/View';
 import translate from '~/services/locale';
-import { updateUserMigration } from '~/store/user/actions';
+import { initializeUser, updateUserMigration } from '~/store/user/actions';
 
 const useStyles = makeStyles(() => ({
   migrationContainer: {
@@ -36,6 +36,9 @@ const useStyles = makeStyles(() => ({
     flexDirection: 'column',
     alignItems: 'center',
   },
+  loaderContainer: {
+    marginTop: '15px',
+  },
 }));
 
 const MigrateYourProfile = () => {
@@ -47,10 +50,12 @@ const MigrateYourProfile = () => {
   const user = useSelector((state) => state.user);
   const isMigrationAccepted = user?.isMigrationAccepted;
 
-  useEffect(() => {
-    if (isMigrationAccepted !== undefined) {
+  useEffect(async () => {
+    if (isMigrationAccepted !== undefined && isMigrationAccepted !== null) {
       setIsMigrateData(isMigrationAccepted);
       setIsLoading(false);
+    } else {
+      dispatch(initializeUser());
     }
   }, [isMigrationAccepted]);
 
@@ -93,7 +98,9 @@ const MigrateYourProfile = () => {
               </FormLabel>
               <Box>
                 {isLoading ? (
-                  <CircularProgress />
+                  <Box className={classes.loaderContainer}>
+                    <CircularProgress />
+                  </Box>
                 ) : (
                   <RadioGroup
                     aria-labelledby="migration-radio-buttons-group"