Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CFE-342] Feature: sticky CTA #866

Merged
merged 16 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Improvements

- [#866](https://github.com/alleslabs/celatone-frontend/pull/866) Update upload code CTA to sticky bar
- [#872](https://github.com/alleslabs/celatone-frontend/pull/872) Change Query/Execute page to Interact Contract
- [#895](https://github.com/alleslabs/celatone-frontend/pull/895) Show collection address and creator on the collection list page

Expand Down
20 changes: 9 additions & 11 deletions src/lib/components/WasmPageContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
import { Flex } from "@chakra-ui/react";
import type { BoxProps } from "@chakra-ui/react";
import { Box } from "@chakra-ui/react";
import type { ReactNode } from "react";

type WasmPageContainerProps = {
children: ReactNode;
width?: string;
boxProps?: BoxProps;
};

const WasmPageContainer = ({
children,
width = "540px",
}: WasmPageContainerProps) => (
<Flex
const WasmPageContainer = ({ children, boxProps }: WasmPageContainerProps) => (
<Box
as="main"
align="center"
width={width}
w={540}
mx="auto"
py={12}
direction="column"
minH="inherit"
py={12}
{...boxProps}
>
{children}
</Flex>
</Box>
);

export default WasmPageContainer;
2 changes: 1 addition & 1 deletion src/lib/components/button/ResendButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
useResendTx,
useSimulateFeeQuery,
} from "lib/app-provider";
import { useTxBroadcast } from "lib/providers/tx-broadcast";
import { useTxBroadcast } from "lib/hooks";
import type { Gas, Message, Msg, Option } from "lib/types";
import { camelToSnake, encode } from "lib/utils";

Expand Down
37 changes: 37 additions & 0 deletions src/lib/components/layouts/FooterCTA.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import type { ButtonProps } from "@chakra-ui/react";
import { Box, Button, Flex, Spinner } from "@chakra-ui/react";

interface FooterCTAProps {
loading?: boolean;
cancelButton: ButtonProps;
cancelLabel?: string;
actionButton: ButtonProps;
actionLabel?: string;
}

export const FooterCTA = ({
loading = false,
cancelButton,
cancelLabel = "Previous",
actionButton,
actionLabel = "Submit",
}: FooterCTAProps) => (
<Box
w="full"
bg="gray.900"
h="70px"
bottom="0"
position="sticky"
zIndex={2}
id="footer-cta"
>
<Flex align="center" justify="space-between" w="540px" h="full" mx="auto">
<Button variant="outline-gray" w="128px" {...cancelButton}>
{cancelLabel}
</Button>
<Button variant="primary" w="128px" {...actionButton}>
{loading ? <Spinner size="md" variant="light" /> : actionLabel}
</Button>
</Flex>
</Box>
);
1 change: 1 addition & 0 deletions src/lib/components/layouts/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "./FooterCTA";
2 changes: 1 addition & 1 deletion src/lib/components/modal/contract/ClearAdmin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useCallback } from "react";
import { ActionModal } from "../ActionModal";
import { AmpEvent, track } from "lib/amplitude";
import { useClearAdminTx } from "lib/app-provider";
import { useTxBroadcast } from "lib/providers/tx-broadcast";
import { useTxBroadcast } from "lib/hooks";
import type { BechAddr32 } from "lib/types";

interface ClearAdminModalProps {
Expand Down
9 changes: 7 additions & 2 deletions src/lib/components/tx/TxReceiptRender.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,13 @@ const variantStyle: Record<
};

const ReceiptRow = ({ title, value, html }: TxReceipt) => (
<Flex fontSize="14px" w="full" direction={{ base: "column", md: "row" }}>
<Text variant="body2" mb={{ base: 1, md: 0 }}>
<Flex
fontSize="14px"
w="full"
direction={{ base: "column", md: "row" }}
gap={4}
>
<Text variant="body2" mb={{ base: 1, md: 0 }} whiteSpace="nowrap">
{title}
</Text>
{html || (
Expand Down
12 changes: 6 additions & 6 deletions src/lib/components/upload/CodeHashBox.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Flex, Text } from "@chakra-ui/react";
import { Box, Text } from "@chakra-ui/react";

import type { Option } from "lib/types";

Expand All @@ -7,7 +7,7 @@ interface CodeHashBoxProps {
}

export const CodeHashBox = ({ codeHash }: CodeHashBoxProps) => (
<Flex position="relative">
<Box position="relative">
<Text
position="absolute"
variant="body3"
Expand All @@ -18,7 +18,7 @@ export const CodeHashBox = ({ codeHash }: CodeHashBoxProps) => (
>
Code Hash
</Text>
<Flex
<Box
border="1px"
borderRadius="5px"
px={3}
Expand All @@ -30,7 +30,7 @@ export const CodeHashBox = ({ codeHash }: CodeHashBoxProps) => (
overflowX="auto"
overflowY="hidden"
>
<Text>{codeHash}</Text>
</Flex>
</Flex>
<Text whiteSpace="nowrap">{codeHash}</Text>
</Box>
</Box>
);
Loading
Loading