Skip to content

Commit ca715cf

Browse files
committed
Merge branch 'frontend-fix-tx-details'
2 parents fecdcb6 + 958f156 commit ca715cf

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

frontends/web/src/components/dialog/dialog.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export const Dialog = ({
165165
className={overlayClass}
166166
>
167167
<UseBackButton handler={closeHandler} />
168-
<div className={modalClass}>
168+
<div className={modalClass} ref={contentRef}>
169169
{title && (
170170
<div className={headerClass}>
171171
<h3 className={style.title}>{title}</h3>
@@ -177,7 +177,7 @@ export const Dialog = ({
177177
)}
178178
</div>
179179
)}
180-
<div className={contentClass} ref={contentRef}>
180+
<div className={contentClass}>
181181
<div className={style.content}>{children}</div>
182182
</div>
183183
</div>

frontends/web/src/components/transactions/components/tx-detail-dialog/tx-detail-header.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ const StatusAndSign = ({
8888
const fromSignToText = () => {
8989
switch (type) {
9090
case 'send':
91-
return t('generic.send');
91+
return t('generic.sent');
9292
case 'receive':
93-
return t('generic.receiveWithoutCoinCode');
93+
return t('generic.received');
9494
case 'send_to_self':
9595
return t('transaction.details.sendToSelf');
9696
}

frontends/web/src/hooks/keyboard.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,7 @@ export const useEsc = (
5454
});
5555
};
5656

57-
const FOCUSABLE_SELECTOR = `
58-
a:not(:disabled),
59-
button:not(:disabled),
60-
input:not(:disabled),
61-
select:not(:disabled),
62-
textarea:not(:disabled),
63-
[tabindex]:not([tabindex="-1"]):not(:disabled)
64-
`;
57+
const FOCUSABLE_SELECTOR = '[autofocus]:not(:disabled)';
6558

6659
/**
6760
* Traps focus inside the given ref when active,

frontends/web/src/locales/en/app.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -894,6 +894,7 @@
894894
"receiveWithoutCoinCode": "Receive",
895895
"receive_bitcoin": "Receive Bitcoin",
896896
"receive_crypto": "Receive crypto",
897+
"received": "Received",
897898
"reset": "Reset",
898899
"resetToDefault": "Reset to default",
899900
"search": "Search…",
@@ -902,6 +903,7 @@
902903
"sell_bitcoin": "Sell Bitcoin",
903904
"sell_crypto": "Sell crypto",
904905
"send": "Send",
906+
"sent": "Sent",
905907
"spend_bitcoin": "Spend bitcoin",
906908
"spend_crypto": "Spend crypto"
907909
},

0 commit comments

Comments
 (0)