Dev 539

extensions/apps/antenna/project.json

@@ -6,6 +6,7 @@
   "targets": {
     "prepare": {
       "dependsOn": [
+        "@akashaorg/ui:prepare",
         "@akashaorg/ui-core-hooks:build",
         "@akashaorg/design-system-core:prepare",
         "@akashaorg/design-system-components:prepare",
@@ -30,10 +31,7 @@
         "cwd": "extensions/apps/antenna",
         "command": "webpack --config webpack.config.cjs"
       },
-      "outputs": [
-        "{projectRoot}/lib",
-        "{workspaceRoot}/dist/apps/antenna"
-      ]
+      "outputs": ["{projectRoot}/lib", "{workspaceRoot}/dist/apps/antenna"]
     },
     "translations": {
       "executor": "./tools/executors/i18n:extract",

extensions/apps/antenna/src/components/app-routes/error-component.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader from '@akashaorg/ui/lib/akasha-components/error-loader';
 import { useTranslation } from 'react-i18next';
 
 type ErrorComponentProps = {

extensions/apps/antenna/src/components/app-routes/not-found-component.tsx

@@ -1,8 +1,7 @@
 import React, { useEffect } from 'react';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader, { ErrorLoaderButton } from '@akashaorg/ui/lib/akasha-components/error-loader';
 import { useTranslation } from 'react-i18next';
 import { useRootComponentProps } from '@akashaorg/ui-core-hooks';
-import Button from '@akashaorg/design-system-core/lib/components/Button';
 
 export const NotFoundComponent = (props: { error?: Error; reset?: (key: string) => void }) => {
   const { t } = useTranslation();
@@ -30,7 +29,9 @@ export const NotFoundComponent = (props: { error?: Error; reset?: (key: string)
         { worldTitle: worldConfig.title },
       )}
     >
-      <Button label={t('Home')} variant="primary" size="md" onClick={navigateHome} />
+      <ErrorLoaderButton variant="default" onClick={navigateHome}>
+        {t('Home')}
+      </ErrorLoaderButton>
     </ErrorLoader>
   );
 };

extensions/apps/antenna/src/components/pages/editor-page/editor-page.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import Stack from '@akashaorg/design-system-core/lib/components/Stack';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
-import Button from '@akashaorg/design-system-core/lib/components/Button';
+import ErrorLoader, { ErrorLoaderButton } from '@akashaorg/ui/lib/akasha-components/error-loader';
 import { useTranslation } from 'react-i18next';
 import { Extension } from '@akashaorg/ui-lib-extensions/lib/react/extension';
 import { useAkashaStore, useRootComponentProps } from '@akashaorg/ui-core-hooks';
@@ -28,18 +27,18 @@ const EditorPage: React.FC<unknown> = () => {
               title={t('Uh-oh! You are not connected!')}
               details={t('To create Beams you must be connected ⚡️')}
             >
-              <Button
-                label={t('Connect')}
-                size="md"
-                variant="primary"
+              <ErrorLoaderButton
+                variant="default"
                 onClick={() =>
                   navigateTo.current({
                     appName: '@akashaorg/app-auth-ewa',
                     getNavigationUrl: navRoutes =>
                       `${navRoutes.Connect}?redirectTo=${encodeURIComponent(location.pathname)}`,
                   })
                 }
-              />
+              >
+                {t('Connect')}
+              </ErrorLoaderButton>
             </ErrorLoader>
           </Stack>
         )}

extensions/apps/antenna/src/components/pages/tag-feed-page/tag-feed-page.tsx

@@ -16,7 +16,7 @@ import {
 import { BeamContentResolver, TagFeed } from '@akashaorg/ui-lib-feed';
 import { Helmet, HelmetProvider } from 'react-helmet-async';
 import getSDK from '@akashaorg/core-sdk';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader from '@akashaorg/ui/lib/akasha-components/error-loader';
 import Stack from '@akashaorg/design-system-core/lib/components/Stack';
 import TagProfileCard from '@akashaorg/design-system-components/lib/components/TagProfileCard';
 import TagFeedHeaderLoader from './tag-feed-header-loader';

extensions/apps/auth-app/project.json

@@ -6,6 +6,7 @@
   "targets": {
     "prepare": {
       "dependsOn": [
+        "@akashaorg/ui:prepare",
         "@akashaorg/ui-core-hooks:build",
         "@akashaorg/design-system-core:prepare",
         "@akashaorg/design-system-components:prepare",

extensions/apps/auth-app/src/components/app-routes/error-component.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader from '@akashaorg/ui/lib/akasha-components/error-loader';
 import { useTranslation } from 'react-i18next';
 
 type ErrorComponentProps = {

extensions/apps/auth-app/src/components/app-routes/not-found-component.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader, { ErrorLoaderButton } from '@akashaorg/ui/lib/akasha-components/error-loader';
 import { useTranslation } from 'react-i18next';
 import { useRootComponentProps } from '@akashaorg/ui-core-hooks';
 import Button from '@akashaorg/design-system-core/lib/components/Button';
@@ -30,7 +30,9 @@ export const NotFoundComponent = (props: { error?: Error; reset?: (key: string)
         { worldTitle: worldConfig.title },
       )}
     >
-      <Button label={t('Home')} variant="primary" size="md" onClick={navigateHome} />
+      <ErrorLoaderButton variant="default" onClick={navigateHome}>
+        {t('Home')}
+      </ErrorLoaderButton>
     </ErrorLoader>
   );
 };

extensions/apps/extensions/project.json

@@ -6,6 +6,7 @@
   "targets": {
     "prepare": {
       "dependsOn": [
+        "@akashaorg/ui:prepare",
         "@akashaorg/ui-core-hooks:build",
         "@akashaorg/design-system-core:prepare",
         "@akashaorg/design-system-components:prepare",

extensions/apps/extensions/src/components/app-routes/error-component.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader from '@akashaorg/ui/lib/akasha-components/error-loader';
 import { useTranslation } from 'react-i18next';
 
 type ErrorComponentProps = {

extensions/apps/extensions/src/components/app-routes/not-found-component.tsx

@@ -1,8 +1,8 @@
 import React, { useEffect } from 'react';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader from '@akashaorg/ui/lib/akasha-components/error-loader';
 import { useTranslation } from 'react-i18next';
 import { useRootComponentProps } from '@akashaorg/ui-core-hooks';
-import Button from '@akashaorg/design-system-core/lib/components/Button';
+import { ErrorLoaderButton } from '@akashaorg/ui/lib/akasha-components/error-loader';
 
 export const NotFoundComponent = (props: { error?: Error; reset?: (key: string) => void }) => {
   const { t } = useTranslation();
@@ -15,7 +15,7 @@ export const NotFoundComponent = (props: { error?: Error; reset?: (key: string)
   }, [logger, props.error]);
 
   const navigateHome = () => {
-        getCorePlugins().routing.navigateTo({
+    getCorePlugins().routing.navigateTo({
       appName: worldConfig.homepageApp,
       getNavigationUrl: () => '/',
     });
@@ -30,7 +30,9 @@ export const NotFoundComponent = (props: { error?: Error; reset?: (key: string)
         { worldTitle: worldConfig.title },
       )}
     >
-      <Button label={t('Home')} variant="primary" onClick={navigateHome} />
+      <ErrorLoaderButton variant="default" onClick={navigateHome}>
+        {t('Home')}
+      </ErrorLoaderButton>
     </ErrorLoader>
   );
 };

extensions/apps/extensions/src/components/pages/developer-mode.tsx

@@ -4,7 +4,7 @@ import { useNavigate } from '@tanstack/react-router';
 import { useAkashaStore, useRootComponentProps } from '@akashaorg/ui-core-hooks';
 import { NotificationEvents, NotificationTypes } from '@akashaorg/typings/lib/ui';
 import Button from '@akashaorg/design-system-core/lib/components/Button';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader, { ErrorLoaderButton } from '@akashaorg/ui/lib/akasha-components/error-loader';
 import Link from '@akashaorg/design-system-core/lib/components/Link';
 import Text from '@akashaorg/design-system-core/lib/components/Text';
 import Toggle from '@akashaorg/design-system-core/lib/components/Toggle';
@@ -77,12 +77,9 @@ export const DeveloperModePage: React.FC<unknown> = () => {
         title={`${t('Uh-oh')}! ${t('You are not connected')}!`}
         details={`${t('To toggle developer mode you must be connected')} ⚡️`}
       >
-        <Button
-          variant="primary"
-          size="md"
-          label={t('Connect')}
-          onClick={handleConnectButtonClick}
-        />
+        <ErrorLoaderButton variant="default" onClick={handleConnectButtonClick}>
+          {t('Connect')}
+        </ErrorLoaderButton>
       </ErrorLoader>
     );
   }

extensions/apps/extensions/src/components/pages/extension-creation-page/extension-creation-page.tsx

@@ -13,7 +13,7 @@ import Text from '@akashaorg/design-system-core/lib/components/Text';
 import Divider from '@akashaorg/design-system-core/lib/components/Divider';
 import ExtensionCreationForm from '@akashaorg/design-system-components/lib/components/ExtensionCreationForm';
 import { DRAFT_EXTENSIONS } from '../../../constants';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader, { ErrorLoaderButton } from '@akashaorg/ui/lib/akasha-components/error-loader';
 import Button from '@akashaorg/design-system-core/lib/components/Button';
 import { Extension, NotificationEvents, NotificationTypes } from '@akashaorg/typings/lib/ui';
 
@@ -78,12 +78,9 @@ export const ExtensionCreationPage: React.FC<unknown> = () => {
         title={`${t('Uh-oh')}! ${t('You are not connected')}!`}
         details={`${t('To create an extension you must be connected')} ⚡️`}
       >
-        <Button
-          variant="primary"
-          size="md"
-          label={t('Connect')}
-          onClick={handleConnectButtonClick}
-        />
+        <ErrorLoaderButton variant="default" onClick={handleConnectButtonClick}>
+          {t('Connect')}
+        </ErrorLoaderButton>
       </ErrorLoader>
     );
   }

extensions/apps/extensions/src/components/pages/extension-creation-page/post-extension-creation-page.tsx

@@ -8,7 +8,7 @@ import Stack from '@akashaorg/design-system-core/lib/components/Stack';
 import DidField from '@akashaorg/design-system-core/lib/components/DidField';
 import Text from '@akashaorg/design-system-core/lib/components/Text';
 import { DRAFT_EXTENSIONS } from '../../../constants';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader, { ErrorLoaderButton } from '@akashaorg/ui/lib/akasha-components/error-loader';
 import Button from '@akashaorg/design-system-core/lib/components/Button';
 import AppAvatar from '@akashaorg/design-system-core/lib/components/AppAvatar';
 import Icon from '@akashaorg/design-system-core/lib/components/Icon';
@@ -56,12 +56,9 @@ export const PostExtensionCreationPage: React.FC<{ extensionId: string }> = ({ e
         title={`${t('Uh-oh')}! ${t('You are not connected')}!`}
         details={`${t('To view this page you must be connected')} ⚡️`}
       >
-        <Button
-          variant="primary"
-          size="md"
-          label={t('Connect')}
-          onClick={handleConnectButtonClick}
-        />
+        <ErrorLoaderButton variant="default" onClick={handleConnectButtonClick}>
+          {t('Connect')}
+        </ErrorLoaderButton>
       </ErrorLoader>
     );
   }

extensions/apps/extensions/src/components/pages/extension-edit-page/contributors-page.tsx

@@ -28,7 +28,7 @@ import { useNavigate } from '@tanstack/react-router';
 import { AtomContext } from './main-page';
 import { useAtom } from 'jotai';
 import { DRAFT_EXTENSIONS, MAX_CONTRIBUTORS } from '../../../constants';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader from '@akashaorg/ui/lib/akasha-components/error-loader';
 
 export type ExtensionEditContributorsPageProps = {
   extensionId: string;

extensions/apps/extensions/src/components/pages/extension-edit-page/main-page.tsx

@@ -7,8 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { useAkashaStore, useRootComponentProps } from '@akashaorg/ui-core-hooks';
 import { AppImageSource } from '@akashaorg/typings/lib/sdk/graphql-types-new';
 import { ExtensionEditStep2FormValues } from '@akashaorg/design-system-components/lib/components/ExtensionEditStep2Form';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
-import Button from '@akashaorg/design-system-core/lib/components/Button';
+import ErrorLoader, { ErrorLoaderButton } from '@akashaorg/ui/lib/akasha-components/error-loader';
 
 export const AtomContext = createContext(null);
 
@@ -82,12 +81,9 @@ export const ExtensionEditMainPage: React.FC<ExtensionEditMainPageProps> = ({ ex
         title={`${t('Uh-oh')}! ${t('You are not connected')}!`}
         details={`${t('To check your extensions you must be connected')} ⚡️`}
       >
-        <Button
-          variant="primary"
-          size="md"
-          label={t('Connect')}
-          onClick={handleConnectButtonClick}
-        />
+        <ErrorLoaderButton variant="default" onClick={handleConnectButtonClick}>
+          {t('Connect')}
+        </ErrorLoaderButton>
       </ErrorLoader>
     );
   }

extensions/apps/extensions/src/components/pages/extension-edit-published-page/edit-published-extension-page.tsx

@@ -6,7 +6,7 @@ import { useGetAppsByIdQuery, useUpdateAppMutation } from '@akashaorg/ui-core-ho
 import Stack from '@akashaorg/design-system-core/lib/components/Stack';
 import Text from '@akashaorg/design-system-core/lib/components/Text';
 import Icon from '@akashaorg/design-system-core/lib/components/Icon';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader from '@akashaorg/ui/lib/akasha-components/error-loader';
 import { ArrowPathIcon } from '@heroicons/react/24/outline';
 import ExtensionEditPublishedForm, {
   ExtensionEditPublishedFormValues,

extensions/apps/extensions/src/components/pages/extension-edit-published-page/main-page.tsx

@@ -6,8 +6,7 @@ import appRoutes, { EDIT_PUBLISHED_EXTENSION } from '../../../routes';
 import { useTranslation } from 'react-i18next';
 import { useAkashaStore, useRootComponentProps } from '@akashaorg/ui-core-hooks';
 import { AppImageSource, AppLinkSource } from '@akashaorg/typings/lib/sdk/graphql-types-new';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
-import Button from '@akashaorg/design-system-core/lib/components/Button';
+import ErrorLoader, { ErrorLoaderButton } from '@akashaorg/ui/lib/akasha-components/error-loader';
 
 export const AtomContext = createContext(null);
 
@@ -71,12 +70,9 @@ export const ExtensionEditPublishedMainPage: React.FC<ExtensionEditPublishedMain
         title={`${t('Uh-oh')}! ${t('You are not connected')}!`}
         details={`${t('To check your extensions you must be connected')} ⚡️`}
       >
-        <Button
-          variant="primary"
-          size="md"
-          label={t('Connect')}
-          onClick={handleConnectButtonClick}
-        />
+        <ErrorLoaderButton variant="default" onClick={handleConnectButtonClick}>
+          {t('Connect')}
+        </ErrorLoaderButton>
       </ErrorLoader>
     );
   }

extensions/apps/extensions/src/components/pages/extension-publish-page/index.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { useNavigate } from '@tanstack/react-router';
 import Stack from '@akashaorg/design-system-core/lib/components/Stack';
 import Text from '@akashaorg/design-system-core/lib/components/Text';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader, { ErrorLoaderButton } from '@akashaorg/ui/lib/akasha-components/error-loader';
 import Button from '@akashaorg/design-system-core/lib/components/Button';
 import Card from '@akashaorg/design-system-core/lib/components/Card';
 import Spinner from '@akashaorg/design-system-core/lib/components/Spinner';
@@ -220,12 +220,9 @@ export const ExtensionPublishPage: React.FC<ExtensionPublishPageProps> = ({ exte
         title={`${t('Uh-oh')}! ${t('You are not connected')}!`}
         details={`${t('To check your extensions you must be connected')} ⚡️`}
       >
-        <Button
-          variant="primary"
-          size="md"
-          label={t('Connect')}
-          onClick={handleConnectButtonClick}
-        />
+        <ErrorLoaderButton variant="default" onClick={handleConnectButtonClick}>
+          {t('Connect')}
+        </ErrorLoaderButton>
       </ErrorLoader>
     );
   }

extensions/apps/extensions/src/components/pages/extension-release-manager/edit-test-release-page.tsx

@@ -4,8 +4,7 @@ import { useNavigate } from '@tanstack/react-router';
 import Stack from '@akashaorg/design-system-core/lib/components/Stack';
 import Card from '@akashaorg/design-system-core/lib/components/Card';
 import Text from '@akashaorg/design-system-core/lib/components/Text';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
-import Button from '@akashaorg/design-system-core/lib/components/Button';
+import ErrorLoader, { ErrorLoaderButton } from '@akashaorg/ui/lib/akasha-components/error-loader';
 import { useAkashaStore, useRootComponentProps } from '@akashaorg/ui-core-hooks';
 import { NotificationEvents, NotificationTypes } from '@akashaorg/typings/lib/ui';
 import ExtensionReleasePublishForm from '@akashaorg/design-system-components/lib/components/ExtensionReleasePublishForm';
@@ -188,12 +187,9 @@ export const EditTestReleasePage: React.FC<EditTestReleasePageProps> = ({
         title={`${t('Uh-oh')}! ${t('You are not connected')}!`}
         details={`${t('To check your extensions you must be connected')} ⚡️`}
       >
-        <Button
-          variant="primary"
-          size="md"
-          label={t('Connect')}
-          onClick={handleConnectButtonClick}
-        />
+        <ErrorLoaderButton variant="default" onClick={handleConnectButtonClick}>
+          {t('Connect')}
+        </ErrorLoaderButton>
       </ErrorLoader>
     );
   }

extensions/apps/extensions/src/components/pages/extension-release-manager/extension-release-manager-page.tsx

@@ -4,7 +4,7 @@ import { useNavigate } from '@tanstack/react-router';
 import Stack from '@akashaorg/design-system-core/lib/components/Stack';
 import Card from '@akashaorg/design-system-core/lib/components/Card';
 import Text from '@akashaorg/design-system-core/lib/components/Text';
-import ErrorLoader from '@akashaorg/design-system-core/lib/components/ErrorLoader';
+import ErrorLoader, { ErrorLoaderButton } from '@akashaorg/ui/lib/akasha-components/error-loader';
 import Button from '@akashaorg/design-system-core/lib/components/Button';
 import InfoCard from '@akashaorg/design-system-core/lib/components/InfoCard';
 import Pill from '@akashaorg/design-system-core/lib/components/Pill';
@@ -249,12 +249,9 @@ export const ExtensionReleaseManagerPage: React.FC<ExtensionReleaseManagerPagePr
         title={`${t('Uh-oh')}! ${t('You are not connected')}!`}
         details={`${t('To check your extensions you must be connected')} ⚡️`}
       >
-        <Button
-          variant="primary"
-          size="md"
-          label={t('Connect')}
-          onClick={handleConnectButtonClick}
-        />
+        <ErrorLoaderButton variant="default" onClick={handleConnectButtonClick}>
+          {t('Connect')}
+        </ErrorLoaderButton>
       </ErrorLoader>
     );
   }