Skip to content

Commit

Permalink
bump macaw, import url directly
Browse files Browse the repository at this point in the history
  • Loading branch information
Cloud11PL committed Sep 20, 2024
1 parent 24ce14e commit c048afd
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 22 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@material-ui/styles": "^4.11.4",
"@reach/auto-id": "^0.16.0",
"@saleor/macaw-ui": "npm:@saleor/[email protected]",
"@saleor/macaw-ui-next": "npm:@saleor/[email protected].11",
"@saleor/macaw-ui-next": "npm:@saleor/[email protected].12",
"@saleor/sdk": "0.6.0",
"@sentry/react": "^8.21.0",
"@sentry/vite-plugin": "^2.21.1",
Expand Down
15 changes: 9 additions & 6 deletions src/home/components/HomePage/HomeGetInTouch.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import { DashboardCard } from "@dashboard/components/Card";
import { TECHNICAL_HELP_CTA_URL } from "@dashboard/links";
import { Button, HelpIcon, Text } from "@saleor/macaw-ui-next";
import * as React from "react";
import { FormattedMessage } from "react-intl";

interface HomeGetInTouchCardProps {
externalHref: string;
}

export const HomeGetInTouchCard: React.FC<HomeGetInTouchCardProps> = ({ externalHref }) => (
export const HomeGetInTouchCard: React.FC = () => (
<DashboardCard
backgroundColor="default2"
borderStyle="solid"
Expand Down Expand Up @@ -41,7 +38,13 @@ export const HomeGetInTouchCard: React.FC<HomeGetInTouchCardProps> = ({ external
</DashboardCard.Content>

<DashboardCard.BottomActions paddingTop={2}>
<Button as="a" target="_blank" href={externalHref} variant="secondary" alignSelf="start">
<Button
as="a"
target="_blank"
href={TECHNICAL_HELP_CTA_URL}
variant="secondary"
alignSelf="start"
>
<FormattedMessage
defaultMessage="Get in touch"
id="HRXLYk"
Expand Down
3 changes: 1 addition & 2 deletions src/home/components/HomePage/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
Notifications,
ProductTopToday,
} from "@dashboard/home/types";
import { TECHNICAL_HELP_CTA_URL } from "@dashboard/links";
import { Box, Skeleton } from "@saleor/macaw-ui-next";
import React from "react";
import { useIntl } from "react-intl";
Expand Down Expand Up @@ -81,7 +80,7 @@ const HomePage: React.FC<HomePageProps> = props => {
</Box>
</DetailPageLayout.Content>

<HomePageRightSidebar activities={activities} technicalHelpUrl={TECHNICAL_HELP_CTA_URL} />
<HomePageRightSidebar activities={activities} />
</DetailPageLayout>
);
};
Expand Down
8 changes: 2 additions & 6 deletions src/home/components/HomePage/HomePageRightSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,11 @@ import { HomeGetInTouchCard } from "./HomeGetInTouch";

export interface HomePageRightSidebarProps {
activities?: HomeData<Activities>;
technicalHelpUrl: string;
}

export const HomePageRightSidebar: React.FC<HomePageRightSidebarProps> = ({
technicalHelpUrl,
activities,
}) => (
export const HomePageRightSidebar: React.FC<HomePageRightSidebarProps> = ({ activities }) => (
<DetailPageLayout.RightSidebar>
<HomeGetInTouchCard externalHref={technicalHelpUrl} />
<HomeGetInTouchCard />

{activities && (
<RequirePermissions requiredPermissions={[PermissionEnum.MANAGE_ORDERS]}>
Expand Down

0 comments on commit c048afd

Please sign in to comment.