Merge pull request #977 from singnet/ui-fix

Fix General account modal

src/App.js

@@ -62,27 +62,26 @@ const App = () => {
     dispatch(userActions.fetchUserDetails());
   }, [dispatch]);
 
-  if (!isInitialized) {
+  const Loader = () => {
     return (
       <div className="loader-container">
         <CircularProgress />
       </div>
     );
+  };
+
+  if (!isInitialized) {
+    return <Loader />;
   }
 
   return (
     <ThemeProvider theme={theme}>
       <Router location={history}>
         <NavigateSetter />
-        <Suspense fallback={<CircularProgress />}>
+        <Suspense fallback={<Loader />}>
           <Switch>
             <Route path={`/${Routes.SIGNUP}`} Component={withRegistrationHeader(SignUp, headerData.SIGNUP)} />
-            <Route
-              replace
-              path={`/${Routes.LOGIN}`}
-              // {...this.props}
-              Component={withRegistrationHeader(Login, headerData.LOGIN)}
-            />
+            <Route replace path={`/${Routes.LOGIN}`} Component={withRegistrationHeader(Login, headerData.LOGIN)} />
             <Route
               path={`/${Routes.FORGOT_PASSWORD}`}
               // {...this.props}

src/Redux/actionCreators/PaymentActions.js

@@ -24,10 +24,12 @@ export const initiatePayment = (paymentObj) => async (dispatch) => {
     if (error.code) {
       throw error;
     }
-    window.location.replace(data.payment.payment_url);
+    window.open(data.payment.payment_url, "_blank");
   } catch (error) {
-    dispatch(loaderActions.stopAppLoader());
+    console.error(error);
     throw error;
+  } finally {
+    dispatch(loaderActions.stopAppLoader());
   }
 };
 

src/components/AiMarketplace/MainSection/Filter/index.js

@@ -46,13 +46,13 @@ const Filter = ({ listView, total_count, handleSearchChange, toggleView, current
       return;
     }
     let filterObj = [];
+    let currentActiveFilterData = {};
     if (value !== "default") {
       filterObj = generateOrganizationsFilterObject([value]);
+      currentActiveFilterData = { [name]: [value] };
     }
     setActiveOrgItem(value);
 
-    const currentActiveFilterData = { [name]: [value] };
-
     const latestPagination = { ...pagination, ...defaultPaginationParameters, q: pagination.q };
     dispatch(serviceActions.handleFilterChange({ pagination: latestPagination, filterObj, currentActiveFilterData }));
   };

src/components/AiMarketplace/MainSection/Filter/styles.js

@@ -23,6 +23,9 @@ export const useStyles = makeStyles((theme) => ({
     display: "flex",
     gap: 20,
     justifyContent: "space-between",
+    "& .MuiSelect-select": {
+      color: theme.palette.text.primary,
+    },
     "& svg": {
       color: theme.palette.text.primary,
       right: "0 !important",

src/components/AiMarketplace/MainSection/index.js

@@ -44,7 +44,7 @@ class MainSection extends Component {
   };
 
   render() {
-    const { classes, services, pagination, currentFilter } = this.props;
+    const { classes, services, pagination } = this.props;
     const { listView } = this.state;
     return (
       <Grid container className={classes.mainSection}>
@@ -55,7 +55,6 @@ class MainSection extends Component {
             handleSearchChange={this.handlePaginationChange}
             toggleView={this.toggleView}
             currentPagination={pagination}
-            currentFilter={currentFilter}
             showToggler={isDesktop}
           />
         </Grid>

src/components/HOC/WithInAppHeader/styles.js

@@ -12,6 +12,7 @@ export const useStyles = makeStyles((theme) => ({
     top: 110,
   },
   componentHolder: {
+    position: "relative",
     minHeight: "calc(100vh - 70px - 250px)",
   },
 }));

src/components/Onboarding/index.js

@@ -17,15 +17,15 @@ const Onboarding = ({ classes }) => {
   const isTermsAccepted = useSelector((state) => state.userReducer.isTermsAccepted);
   const nickname = useSelector((state) => state.userReducer.nickname);
 
-  const [activeSection, setActiveSection] = useState(1);
+  const [activeSection, setActiveSection] = useState(0);
   const progressText = [{ label: "Authentication" }, { label: "Terms of service" }];
 
   const initialChecks = () => {
     if (!isEmailVerified) {
       return;
     }
-    if (activeSection === 1) {
-      setActiveSection(2);
+    if (activeSection === 0) {
+      setActiveSection(1);
     }
     if (isTermsAccepted) {
       if (location?.state && location?.state?.sourcePath) {
@@ -76,7 +76,7 @@ const Onboarding = ({ classes }) => {
           key={item.title}
           classes={classes}
           item={item}
-          active={activeSection === index + 1}
+          active={activeSection === index}
           activeSection={activeSection}
           progressText={progressText}
         />

src/components/ServiceDetails/AboutService/ServiceDemo/Purchase/ExpiredSession/GeneralAccountWallet/NextAction.js

@@ -30,7 +30,7 @@ const NextAction = (props) => {
   return (
     <StyledButton
       type="blue"
-      btnText="continue"
+      btnText="Run service"
       disabled={channel.balanceInAgi <= 0 || anyPendingTxn}
       onClick={handleContinue}
     />

src/components/ServiceDetails/AboutService/ServiceDemo/Purchase/ExpiredSession/GeneralAccountWallet/PaymentPopup/Details/AGITokens.js

@@ -1,11 +1,10 @@
 import React from "react";
-import Typography from "@mui/material/Typography";
 
 const AGITokens = ({ amount }) => {
   if (!amount || isNaN(amount)) {
-    return <Typography variant="body2">Enter an amount to view equivalent AGIX Tokens</Typography>;
+    return <span>Enter an amount to view equivalent AGIX Tokens</span>;
   }
-  return <Typography variant="body2">{amount} AGIX Tokens</Typography>;
+  return <span>{amount} AGIX Tokens</span>;
 };
 
 export default AGITokens;