Skip to content
This repository was archived by the owner on May 15, 2025. It is now read-only.

rebased merkl-lite sync#56

Open
clmntsnr wants to merge 18 commits intomainfrom
cleanup
Open

rebased merkl-lite sync#56
clmntsnr wants to merge 18 commits intomainfrom
cleanup

Conversation

@clmntsnr
Copy link
Copy Markdown
Collaborator

@clmntsnr clmntsnr commented Jan 7, 2025

No description provided.

merkl.config.ts Outdated
protocols: {
icon: "RiVipCrown2Fill",
route: "/protocols",
<<<<<<< HEAD
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merge conflicts here

name: "Merkl Lite",
description: "Merkl Lite",
url: "https://app.merkl.xyz",
name: "Puffer",
Copy link
Copy Markdown
Contributor

@indaviande indaviande Jan 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we keep Merkl infos as default instead of puffers ones?

protocols: {
icon: "RiVipCrown2Fill",
route: "/protocols",
key: uuidv4(),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should keep import { v4 as uuidv4 } from "uuid";
uuidv4() as the previous JS native function crypto.randomUUID() generates error due to retro-compatibiltiy.

hugolxt and others added 11 commits January 7, 2025 15:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants