-
Notifications
You must be signed in to change notification settings - Fork 324
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'LedgerHQ:develop' into develop
- Loading branch information
Showing
54 changed files
with
2,861 additions
and
1,266 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| --- | ||
| "ledger-live-desktop": patch | ||
| "@ledgerhq/live-nft": patch | ||
| --- | ||
|
|
||
| Add detail drawers for inscriptions of ordinals protocol |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| --- | ||
| "@ledgerhq/coin-near": patch | ||
| "ledger-live-desktop": patch | ||
| "live-mobile": patch | ||
| "@ledgerhq/live-common": patch | ||
| --- | ||
|
|
||
| remove rewards feature from near |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "live-mobile": patch | ||
| --- | ||
|
|
||
| Run tests files at `e2e/specs/*.spec.ts` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
.../newArch/features/Collectibles/Ordinals/components/Inscriptions/DetailsDrawer/Actions.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| import React from "react"; | ||
| import { Flex, Icons, IconsLegacy, Text } from "@ledgerhq/react-ui"; | ||
| import Button from "~/renderer/components/Button"; | ||
| import { useTranslation } from "react-i18next"; | ||
|
|
||
| const Actions = () => { | ||
| const { t } = useTranslation(); | ||
| return ( | ||
| <Flex alignItems="center" columnGap={12}> | ||
| <Button | ||
| outlineGrey | ||
| style={{ flex: 1, justifyContent: "center" }} | ||
| my={4} | ||
| onClick={() => { | ||
| /* TODO */ | ||
| }} | ||
| center | ||
| > | ||
| <Flex columnGap={1}> | ||
| <Icons.Eye color="neutral.c100" /> | ||
| <Text variant="bodyLineHeight" fontWeight="600" fontSize={14} color="neutral.c100"> | ||
| {t("ordinals.inscriptions.detailsDrawer.hide")} | ||
| </Text> | ||
| </Flex> | ||
| </Button> | ||
| <Button outlineGrey> | ||
| <IconsLegacy.OthersMedium /> | ||
| </Button> | ||
| </Flex> | ||
| ); | ||
| }; | ||
| export default Actions; |
25 changes: 25 additions & 0 deletions
25
...newArch/features/Collectibles/Ordinals/components/Inscriptions/DetailsDrawer/SubTitle.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import React from "react"; | ||
| import { Flex, Text } from "@ledgerhq/react-ui"; | ||
| import IconContainer from "LLD/features/Collectibles/components/Collection/TableRow/IconContainer"; | ||
| import { IconProps } from "LLD/features/Collectibles/types/Collection"; | ||
| import { MappingKeys } from "LLD/features/Collectibles/types/Ordinals"; | ||
| import { useTranslation } from "react-i18next"; | ||
|
|
||
| type Props = { | ||
| icons: (({ size, color, style }: IconProps) => JSX.Element)[]; | ||
| names: MappingKeys[]; | ||
| }; | ||
|
|
||
| const SubTitle: React.FC<Props> = ({ icons, names }) => { | ||
| const { t } = useTranslation(); | ||
| return ( | ||
| <Flex mb={20} alignItems="center" columnGap={12}> | ||
| <IconContainer icons={icons} iconNames={names} /> | ||
| <Text variant="bodyLineHeight" fontSize={14} color="neutral.c70"> | ||
| {t("ordinals.inscriptions.detailsDrawer.storedOnChain")} | ||
| </Text> | ||
| </Flex> | ||
| ); | ||
| }; | ||
|
|
||
| export default SubTitle; |
Oops, something went wrong.