Skip to content

Fixed conflicts #146

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.

Sign up for GitHub

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

Merged
arhtudormorar merged 5 commits into from
Jul 3, 2025
Merged

Fixed conflicts #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59ee775
Merge pull request #130 from multiversx/development
MiroMargineanu Jun 23, 2025
b0b7b7d
v0.0.8 (#138)
MiroMargineanu Jun 30, 2025
c5181e9
0.0.9
MiroMargineanu Jul 3, 2025
40c2248
Updated CHANGELOG.md
MiroMargineanu Jul 3, 2025
0d63e6c
Merge branch 'main' into mm-upgrade-version-2
MiroMargineanu Jul 3, 2025
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [[0.0.9](https://github.com/multiversx/mx-sdk-dapp-ui/pull/145)] - 2025-07-03

- [Fixed icons max width / height in toasts.](https://github.com/multiversx/mx-sdk-dapp-ui/pull/143)
- [Refactor color variable names to avoid Tailwind naming conflicts](https://github.com/multiversx/mx-sdk-dapp-ui/pull/142)
- [Added dataTestId to unlock panel provider button](https://github.com/multiversx/mx-sdk-dapp-ui/pull/141)
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@multiversx/sdk-dapp-ui",
"version": "0.0.8",
"version": "0.0.9",
"description": "A library to hold UI components for a dApp on the MultiversX blockchain",
"author": "MultiversX",
"license": "MIT",
Expand Down
51 changes: 0 additions & 51 deletions src/components.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,18 +232,6 @@ export namespace Components {
"panelClassName"?: string;
"panelTitle": string;
}
interface MvxSidePanelSwiper {
"close": () => Promise<void>;
/**
* @default false
*/
"open": boolean;
"openToSnapPoint": (snapIndex?: number) => Promise<void>;
/**
* @default ''
*/
"sidePanelIdentifier": string;
}
interface MvxSignTransactionsAdvanced {
"data": string;
"highlight"?: string;
Expand Down Expand Up @@ -431,7 +419,6 @@ export namespace Components {
}
interface MvxUnlockButton {
"class"?: string;
"dataTestId"?: string;
"icon"?: HTMLElement;
"iconUrl": string;
"label": string;
Expand Down Expand Up @@ -540,10 +527,6 @@ export interface MvxSidePanelHeaderCustomEvent<T> extends CustomEvent<T> {
detail: T;
target: HTMLMvxSidePanelHeaderElement;
}
export interface MvxSidePanelSwiperCustomEvent<T> extends CustomEvent<T> {
detail: T;
target: HTMLMvxSidePanelSwiperElement;
}
export interface MvxSimpleToastCustomEvent<T> extends CustomEvent<T> {
detail: T;
target: HTMLMvxSimpleToastElement;
Expand Down Expand Up @@ -901,24 +884,6 @@ declare global {
prototype: HTMLMvxSidePanelHeaderElement;
new (): HTMLMvxSidePanelHeaderElement;
};
interface HTMLMvxSidePanelSwiperElementEventMap {
"sheetDismiss": void;
"sheetSnapChange": { index: number; snapPoint: string };
}
interface HTMLMvxSidePanelSwiperElement extends Components.MvxSidePanelSwiper, HTMLStencilElement {
addEventListener<K extends keyof HTMLMvxSidePanelSwiperElementEventMap>(type: K, listener: (this: HTMLMvxSidePanelSwiperElement, ev: MvxSidePanelSwiperCustomEvent<HTMLMvxSidePanelSwiperElementEventMap[K]>) => any, options?: boolean | AddEventListenerOptions): void;
addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
removeEventListener<K extends keyof HTMLMvxSidePanelSwiperElementEventMap>(type: K, listener: (this: HTMLMvxSidePanelSwiperElement, ev: MvxSidePanelSwiperCustomEvent<HTMLMvxSidePanelSwiperElementEventMap[K]>) => any, options?: boolean | EventListenerOptions): void;
removeEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
}
var HTMLMvxSidePanelSwiperElement: {
prototype: HTMLMvxSidePanelSwiperElement;
new (): HTMLMvxSidePanelSwiperElement;
};
interface HTMLMvxSignTransactionsAdvancedElement extends Components.MvxSignTransactionsAdvanced, HTMLStencilElement {
}
var HTMLMvxSignTransactionsAdvancedElement: {
Expand Down Expand Up @@ -1312,7 +1277,6 @@ declare global {
"mvx-provider-idle-screen": HTMLMvxProviderIdleScreenElement;
"mvx-side-panel": HTMLMvxSidePanelElement;
"mvx-side-panel-header": HTMLMvxSidePanelHeaderElement;
"mvx-side-panel-swiper": HTMLMvxSidePanelSwiperElement;
"mvx-sign-transactions-advanced": HTMLMvxSignTransactionsAdvancedElement;
"mvx-sign-transactions-advanced-data": HTMLMvxSignTransactionsAdvancedDataElement;
"mvx-sign-transactions-advanced-data-decode": HTMLMvxSignTransactionsAdvancedDataDecodeElement;
Expand Down Expand Up @@ -1571,18 +1535,6 @@ declare namespace LocalJSX {
"panelClassName"?: string;
"panelTitle"?: string;
}
interface MvxSidePanelSwiper {
"onSheetDismiss"?: (event: MvxSidePanelSwiperCustomEvent<void>) => void;
"onSheetSnapChange"?: (event: MvxSidePanelSwiperCustomEvent<{ index: number; snapPoint: string }>) => void;
/**
* @default false
*/
"open"?: boolean;
/**
* @default ''
*/
"sidePanelIdentifier"?: string;
}
interface MvxSignTransactionsAdvanced {
"data"?: string;
"highlight"?: string;
Expand Down Expand Up @@ -1771,7 +1723,6 @@ declare namespace LocalJSX {
}
interface MvxUnlockButton {
"class"?: string;
"dataTestId"?: string;
"icon"?: HTMLElement;
"iconUrl"?: string;
"label"?: string;
Expand Down Expand Up @@ -1881,7 +1832,6 @@ declare namespace LocalJSX {
"mvx-provider-idle-screen": MvxProviderIdleScreen;
"mvx-side-panel": MvxSidePanel;
"mvx-side-panel-header": MvxSidePanelHeader;
"mvx-side-panel-swiper": MvxSidePanelSwiper;
"mvx-sign-transactions-advanced": MvxSignTransactionsAdvanced;
"mvx-sign-transactions-advanced-data": MvxSignTransactionsAdvancedData;
"mvx-sign-transactions-advanced-data-decode": MvxSignTransactionsAdvancedDataDecode;
Expand Down Expand Up @@ -1974,7 +1924,6 @@ declare module "@stencil/core" {
"mvx-provider-idle-screen": LocalJSX.MvxProviderIdleScreen & JSXBase.HTMLAttributes<HTMLMvxProviderIdleScreenElement>;
"mvx-side-panel": LocalJSX.MvxSidePanel & JSXBase.HTMLAttributes<HTMLMvxSidePanelElement>;
"mvx-side-panel-header": LocalJSX.MvxSidePanelHeader & JSXBase.HTMLAttributes<HTMLMvxSidePanelHeaderElement>;
"mvx-side-panel-swiper": LocalJSX.MvxSidePanelSwiper & JSXBase.HTMLAttributes<HTMLMvxSidePanelSwiperElement>;
"mvx-sign-transactions-advanced": LocalJSX.MvxSignTransactionsAdvanced & JSXBase.HTMLAttributes<HTMLMvxSignTransactionsAdvancedElement>;
"mvx-sign-transactions-advanced-data": LocalJSX.MvxSignTransactionsAdvancedData & JSXBase.HTMLAttributes<HTMLMvxSignTransactionsAdvancedDataElement>;
"mvx-sign-transactions-advanced-data-decode": LocalJSX.MvxSignTransactionsAdvancedDataDecode & JSXBase.HTMLAttributes<HTMLMvxSignTransactionsAdvancedDataDecodeElement>;
Expand Down
4 changes: 2 additions & 2 deletions ...toast/components/transaction-toast-details/components/transaction-toast-details-body.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

.transaction-details-list-item-icon-success {
background-color: var(--mvx-success-bg-color);

svg,
.svg-inline--fa {
color: var(--mvx-success-color) !important;
Expand Down Expand Up @@ -88,7 +88,7 @@
@apply mvx:flex mvx:invisible!;

.transaction-details-list-item-copy-icon {
@apply mvx:h-4 mvx:w-4 mvx:flex mvx:flex-col mvx:justify-end mvx:shrink-0 mvx:transition-opacity mvx:duration-200 mvx:ease-in-out ;
@apply mvx:h-4 mvx:w-4 mvx:flex mvx:flex-col mvx:justify-end mvx:shrink-0 mvx:transition-opacity mvx:duration-200 mvx:ease-in-out;
color: var(--mvx-text-color-tertiary);

&:hover {
Expand Down
Loading