Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:LedgerHQ/ledger-live into feat/t…
Browse files Browse the repository at this point in the history
…racking-PTX-transactions
  • Loading branch information
chrisduma-ledger committed Dec 2, 2024
2 parents dacce6b + 942954c commit 1656338
Show file tree
Hide file tree
Showing 90 changed files with 2,385 additions and 831 deletions.
5 changes: 5 additions & 0 deletions .changeset/beige-rings-move.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": minor
---

LLM - Ledger Sync improve error message when deleting backup on multiple instances at the same time
5 changes: 5 additions & 0 deletions .changeset/eight-ducks-rescue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": minor
---

Prepare add account v2 reusable screens
9 changes: 9 additions & 0 deletions .changeset/few-toes-drive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"@ledgerhq/types-live": minor
"@ledgerhq/coin-evm": minor
"ledger-live-desktop": minor
"live-mobile": minor
"@ledgerhq/live-common": minor
---

add mev protection
5 changes: 5 additions & 0 deletions .changeset/heavy-starfishes-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": minor
---

LLM - Ledger Sync improved error message when a removed member tries to remove another member
5 changes: 5 additions & 0 deletions .changeset/honest-feet-trade.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": minor
---

fix swap Id in history
7 changes: 7 additions & 0 deletions .changeset/odd-cooks-glow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"ledger-live-desktop": minor
"@ledgerhq/live-nft-react": minor
"@ledgerhq/live-nft": minor
---

Rework Hiddencollections
8 changes: 8 additions & 0 deletions .changeset/shaggy-days-flash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@ledgerhq/types-live": patch
"ledger-live-desktop": patch
"live-mobile": patch
"@ledgerhq/live-common": patch
---

Remove `feature_recover_upsell_redirection` feature flag and unused components
5 changes: 5 additions & 0 deletions .changeset/silly-cougars-rescue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": minor
---

LLM - Ledger Sync improved error message when an unauthorized member tries to delete a backup
5 changes: 5 additions & 0 deletions .changeset/spicy-schools-look.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": patch
---

Fix speculos transport
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export function createContextMenuItems({
openModal("MODAL_HIDE_NFT_COLLECTION", {
collectionName: collectionName ?? collectionAddress,
collectionId: `${account.id}|${collectionAddress}`,
blockchain: account.currency.id,
onClose: () => {
if (goBackToAccount) {
setDrawer();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ export const useOpenHideCollectionModal = (
collectionName: collectionName as string,
collectionId: `${account.id}|${nft.contract}`,
onClose,
blockchain: account.currency.id,
}),
),
};
}, [account.id, dispatch, metadata, nft.contract, onClose, t]);
}, [account.currency.id, account.id, dispatch, metadata, nft.contract, onClose, t]);
};
3 changes: 3 additions & 0 deletions apps/ledger-live-desktop/src/renderer/actions/constants.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
// Action types

/** Settings --------- */
export const TOGGLE_MEMOTAG_INFO = "settings/toggleShouldDisplayMemoTagInfo";
export const TOGGLE_MEV = "settings/toggleMEV";
export const TOGGLE_MARKET_WIDGET = "settings/toggleMarketWidget";
export const UPDATE_NFT_COLLECTION_STATUS = "settings/updateNftCollectionStatus";
34 changes: 17 additions & 17 deletions apps/ledger-live-desktop/src/renderer/actions/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@ import {
import { useRefreshAccountsOrdering } from "~/renderer/actions/general";
import { Language, Locale } from "~/config/languages";
import { Layout } from "LLD/features/Collectibles/types/Layouts";
import { TOGGLE_MARKET_WIDGET, TOGGLE_MEMOTAG_INFO, TOGGLE_MEV } from "./constants";
import {
TOGGLE_MARKET_WIDGET,
TOGGLE_MEMOTAG_INFO,
TOGGLE_MEV,
UPDATE_NFT_COLLECTION_STATUS,
} from "./constants";
import { BlockchainsType } from "@ledgerhq/live-nft/supported";
import { NftStatus } from "@ledgerhq/live-nft/types";
export type SaveSettings = (a: Partial<Settings>) => {
type: string;
payload: Partial<Settings>;
Expand Down Expand Up @@ -215,15 +222,6 @@ export const blacklistToken = (tokenId: string) => ({
type: "BLACKLIST_TOKEN",
payload: tokenId,
});
export const hideNftCollection = (collectionId: string) => ({
type: "HIDE_NFT_COLLECTION",
payload: collectionId,
});

export const whitelistNftCollection = (collectionId: string) => ({
type: "WHITELIST_NFT_COLLECTION",
payload: collectionId,
});

export const hideOrdinalsAsset = (inscriptionId: string) => ({
type: "HIDE_ORDINALS_ASSET",
Expand Down Expand Up @@ -255,14 +253,16 @@ export const showToken = (tokenId: string) => ({
type: "SHOW_TOKEN",
payload: tokenId,
});
export const unhideNftCollection = (collectionId: string) => ({
type: "UNHIDE_NFT_COLLECTION",
payload: collectionId,
});
export const unwhitelistNftCollection = (collectionId: string) => ({
type: "UNWHITELIST_NFT_COLLECTION",
payload: collectionId,

export const updateNftStatus = (
blockchain: BlockchainsType,
collectionId: string,
status: NftStatus,
) => ({
type: UPDATE_NFT_COLLECTION_STATUS,
payload: { blockchain, collectionId, status },
});

export const unhideOrdinalsAsset = (inscriptionId: string) => ({
type: "UNHIDE_ORDINALS_ASSET",
payload: inscriptionId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export default function NFTCollectionContextMenu({
history.replace(`account/${account.id}`);
}
},
blockchain: account.currency.id,
}),
),
},
Expand Down

This file was deleted.

Loading

0 comments on commit 1656338

Please sign in to comment.