Merge pull request #1057 from singnet/users-development

Users development

Author: MarinaFedy

public/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "SingularityNET Beta Dapp",
-  "name": "SingularityNET Beta Dapp",
+  "short_name": "SingularityNET AI Merketplace",
+  "name": "SingularityNET AI Merketplace",
   "icons": [
     {
       "src": "favicon.ico",

src/App.js

@@ -61,7 +61,7 @@ const App = () => {
 
   useEffect(() => {
     dispatch(userActions.fetchUserDetails());
-    dispatch(userActions.getIsTermsAcceptedInfo());
+    isLoggedIn && dispatch(userActions.getIsTermsAcceptedInfo());
   }, [dispatch]);
 
   const Loader = () => {
@@ -170,17 +170,7 @@ const App = () => {
                 />
               }
             />
-            <Route
-              path="/"
-              element={
-                <PrivateRoute
-                  isAllowed={isLoggedInAndTermsAccepted}
-                  component={withInAppWrapper(AiMarketplace)}
-                  redirectTo={`/${Routes.ONBOARDING}`}
-                  path="/"
-                />
-              }
-            />
+            <Route path="/" Component={withInAppWrapper(AiMarketplace)} />
             <Route path={`/${Routes.AI_REQUEST_FORM}`} Component={AiRequestForm} />
             <Route path={`/${Routes.GET_STARTED}`} Component={withInAppWrapper(GetStarted)} />
             <Route path="*" Component={PageNotFound} />

src/Redux/actionCreators/ServiceActions.js

@@ -42,8 +42,9 @@ export const fetchUserOrganizationsList = () => async (dispatch) => {
 
 const onlyUserOrgsFilter = () => async (dispatch) => {
   const userOrganizations = await dispatch(fetchUserOrganizationsList());
-  const userOrganizationsId = userOrganizations.data.map((organization) => organization.orgId);
-  const filterObj = { orgId: [...userOrganizationsId, process.env.REACT_APP_EXAMPLE_SERVICE_ORG_ID] };
+  const userOrganizationsId = userOrganizations.data.map((organization) => organization.org_id);
+  const filterObj = { orgId: userOrganizationsId };
+
   return filterObj;
 };
 

src/components/AiMarketplace/index.js

@@ -6,7 +6,7 @@ import PromoComponent from "../PromoComponent";
 import { Helmet } from "react-helmet";
 
 const seoData = {
-  title: "SingularityNET Beta Dapp",
+  title: "SingularityNET AI Merketplace",
   description: `The SingularityNET Marketplace hosts AI services. Services offer free calls to try before you use ${process.env.REACT_APP_TOKEN_NAME} or Paypal to purchase`,
   image: `${process.env.REACT_APP_SNET_CDN}/dapp/assets/images/SEO/singularitynet-marketplace.png`,
   twitterImage: `${process.env.REACT_APP_SNET_CDN}/dapp/assets/images/SEO/singularitynet-marketplace-twitter.png`,

src/components/GetStarted/index.js

@@ -9,7 +9,7 @@ import { useStyles } from "./styles";
 import SeoMetadata from "../common/SeoMetadata";
 
 const seoData = {
-  title: "SingularityNET Beta Dapp",
+  title: "SingularityNET AI Merketplace",
   description: `The SingularityNET Marketplace hosts AI services. Services offer free calls to try before you use ${process.env.REACT_APP_TOKEN_NAME} or Paypal to purchase`,
   image: `${process.env.REACT_APP_SNET_CDN}/dapp/assets/images/SEO/singularitynet-marketplace.png`,
   twitterImage: `${process.env.REACT_APP_SNET_CDN}/dapp/assets/images/SEO/singularitynet-marketplace-twitter.png`,