Skip to content

Commit 77a4158

Browse files
🎨 (ledger-button) [NO-ISSUE]: UI fixes - format address, icon sizes, home layout (#279)
2 parents 30dfd46 + b991653 commit 77a4158

File tree

8 files changed

+41
-41
lines changed

8 files changed

+41
-41
lines changed

‎apps/test-dapp/src/components/modals/ProviderRequestModal.tsx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ interface ProviderRequestModalProps {
3838
onClose: () => void;
3939
}
4040

41-
export function ProviderRequestModal({ onSubmit, onClose }: ProviderRequestModalProps) {
41+
export function ProviderRequestModal({
42+
onSubmit,
43+
onClose,
44+
}: ProviderRequestModalProps) {
4245
const methodRef = useRef<HTMLSelectElement>(null);
4346
const paramsRef = useRef<HTMLTextAreaElement>(null);
4447

@@ -68,7 +71,9 @@ export function ProviderRequestModal({ onSubmit, onClose }: ProviderRequestModal
6871
</Select>
6972
</Field>
7073
<Field className={styles["transactions__field"]}>
71-
<Label className={styles["transactions__label"]}>Params (JSON array)</Label>
74+
<Label className={styles["transactions__label"]}>
75+
Params (JSON array)
76+
</Label>
7277
<Textarea
7378
ref={paramsRef}
7479
className={styles["transactions__textarea"]}

‎packages/ledger-button/src/components/atom/icon/ledger-icon.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ export class LedgerIcon extends LitElement {
8686
private get iconClasses(): string {
8787
const sizeClasses: { [key: string]: string } = {
8888
small: "lb-w-16 lb-h-16",
89+
20: "lb-w-20 lb-h-20",
8990
medium: "lb-w-24 lb-h-24",
9091
large: "lb-w-32 lb-h-32",
9192
};

‎packages/ledger-button/src/components/molecule/account-item/ledger-account-item.ts‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { customElement, property } from "lit/decorators.js";
88
import { classMap } from "lit/directives/class-map.js";
99

1010
import { tailwindElement } from "../../../tailwind-element.js";
11+
import { formatAddress } from "../../../utils/format-address.js";
1112

1213
const accountItemVariants = cva([
1314
"lb-flex lb-min-w-full lb-cursor-pointer lb-justify-between lb-p-12",
@@ -120,20 +121,13 @@ export class LedgerAccountItemMolecule extends LitElement {
120121
);
121122
}
122123

123-
private formatAddress(address: string): string {
124-
if (!address || address.length <= 8) {
125-
return address;
126-
}
127-
return `${address.slice(0, 6)}...${address.slice(-4)}`;
128-
}
129-
130124
private renderAccountInfo() {
131125
return html`
132126
<div class="lb-flex lb-flex-col lb-gap-4 lb-text-left">
133127
<span class="lb-text-base lb-body-2-semi-bold">${this.title}</span>
134128
<div class="lb-flex lb-items-center lb-gap-4">
135129
<span class="lb-whitespace-nowrap lb-text-muted lb-body-3">
136-
${this.formatAddress(this.address)}
130+
${formatAddress(this.address)}
137131
</span>
138132
<ledger-crypto-icon
139133
ledger-id=${this.currencyId}

‎packages/ledger-button/src/components/molecule/account-switch/ledger-account-switch.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { css, html, LitElement } from "lit";
44
import { customElement, property } from "lit/decorators.js";
55

66
import { tailwindElement } from "../../../tailwind-element.js";
7+
import { formatAddress } from "../../../utils/format-address.js";
78

89
const styles = css`
910
:host {
@@ -37,10 +38,6 @@ export class LedgerAccountSwitch extends LitElement {
3738
);
3839
};
3940

40-
private formatAddress(address: string) {
41-
return address.slice(0, 6) + "..." + address.slice(-4);
42-
}
43-
4441
override render() {
4542
if (!this.account) {
4643
return;
@@ -68,7 +65,7 @@ export class LedgerAccountSwitch extends LitElement {
6865
<span
6966
class="lb-grow lb-basis-80 lb-overflow-hidden lb-text-ellipsis lb-text-nowrap lb-text-muted lb-body-3"
7067
>
71-
${this.formatAddress(this.account.freshAddress)}
68+
${formatAddress(this.account.freshAddress)}
7269
</span>
7370
</button>
7471
`;

‎packages/ledger-button/src/components/molecule/wallet-actions/ledger-wallet-actions.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,10 @@ export class LedgerWalletActions extends LitElement {
7171
aria-label=${this.getActionLabel(action)}
7272
>
7373
<div class="lb-h-20 lb-w-20 lb-shrink-0">
74-
<ledger-icon
75-
fillColor="white"
76-
type=${action}
77-
size="medium"
78-
></ledger-icon>
74+
<ledger-icon fillColor="white" type=${action} size="20"></ledger-icon>
7975
</div>
8076
<span
81-
class="lb-overflow-hidden lb-text-ellipsis lb-text-center lb-text-base"
77+
class="lb-overflow-hidden lb-text-ellipsis lb-text-center lb-body-3"
8278
>${this.getActionLabel(action)}</span
8379
>
8480
</button>

‎packages/ledger-button/src/domain/account-tokens/account-tokens.ts‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
} from "../../context/language-context.js";
1313
import { Navigation } from "../../shared/navigation.js";
1414
import { tailwindElement } from "../../tailwind-element.js";
15+
import { formatAddress } from "../../utils/format-address.js";
1516
import { AccountTokenController } from "./account-token-controller.js";
1617

1718
@customElement("account-tokens-screen")
@@ -39,13 +40,6 @@ export class AccountTokensScreen extends LitElement {
3940
@property({ attribute: false })
4041
public languages!: LanguageContext;
4142

42-
private formatAddress(address: string): string {
43-
if (!address || address.length <= 8) {
44-
return address;
45-
}
46-
return `${address.slice(0, 6)}...${address.slice(-4)}`;
47-
}
48-
4943
private renderTokenItem = (token: Token) => {
5044
return html`
5145
<ledger-chain-item
@@ -105,9 +99,7 @@ export class AccountTokensScreen extends LitElement {
10599
>${this.controller.account.name}</span
106100
>
107101
<span class="lb-text-muted lb-body-3"
108-
>${this.formatAddress(
109-
this.controller.account.freshAddress,
110-
)}</span
102+
>${formatAddress(this.controller.account.freshAddress)}</span
111103
>
112104
</div>
113105
</div>

‎packages/ledger-button/src/domain/home/ledger-home.ts‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ export class LedgerHomeScreen extends LitElement {
181181
return html`
182182
<div class="lb-relative lb-h-full">
183183
<div
184-
class="lb-flex lb-flex-col lb-items-stretch lb-gap-24 lb-p-24 lb-pt-0"
184+
class="lb-flex lb-flex-col lb-items-stretch lb-gap-12 lb-p-24 lb-pt-0"
185185
>
186186
<div
187-
class="lb-flex lb-flex-col lb-gap-32 lb-rounded-md lb-bg-muted lb-p-16"
187+
class="lb-flex lb-flex-col lb-gap-24 lb-rounded-md lb-bg-muted lb-p-16"
188188
>
189189
<div class="lb-flex lb-flex-row lb-items-center lb-justify-between">
190190
<ledger-account-switch
@@ -213,14 +213,16 @@ export class LedgerHomeScreen extends LitElement {
213213
@wallet-action-click=${this.handleWalletActionClick}
214214
></ledger-wallet-actions>
215215
216-
<ledger-tabs
217-
.tabs=${[
218-
{ id: "tokens", label: "Tokens" },
219-
{ id: "transactions", label: "Transactions" },
220-
]}
221-
.selectedId=${this.activeTab}
222-
@tab-change=${this.handleTabChange}
223-
></ledger-tabs>
216+
<div class="lb-mt-12">
217+
<ledger-tabs
218+
.tabs=${[
219+
{ id: "tokens", label: "Tokens" },
220+
{ id: "transactions", label: "Transactions" },
221+
]}
222+
.selectedId=${this.activeTab}
223+
@tab-change=${this.handleTabChange}
224+
></ledger-tabs>
225+
</div>
224226
225227
${this.activeTab === "tokens"
226228
? html`<token-list-screen></token-list-screen>`
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/**
2+
* Formats an address to display a truncated version with ellipsis.
3+
* Example: "0xC5D2460186F7233C927E7DB2DCC703C0E500B653CA82273B7BFAD8045D85A470" -> "0xC5...A470"
4+
*
5+
* @param address - The full address string to format
6+
* @returns The formatted address with first 4 characters + "..." + last 4 characters
7+
*/
8+
export function formatAddress(address: string): string {
9+
if (!address || address.length <= 8) {
10+
return address;
11+
}
12+
return `${address.slice(0, 4)}...${address.slice(-4)}`;
13+
}

0 commit comments

Comments
 (0)