Skip to content

Commit c24f5c0

Browse files
committed
trim nano_account in filters
1 parent c3c2582 commit c24f5c0

File tree

3 files changed

+37
-4
lines changed

3 files changed

+37
-4
lines changed

src/App.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ a:hover {
105105
}
106106

107107
.truncate {
108-
display: block;
109108
white-space: nowrap;
110109
overflow: hidden;
111110
text-overflow: ellipsis;

src/components/utils/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export const BLOCK_REGEX = /[0-9A-F]{64}/;
8080
export const isValidAccountAddress = (address: string): boolean =>
8181
new RegExp(`^${ACCOUNT_REGEX.toString().replace(/\//g, "")}$`, "i").test(address);
8282

83-
export const getAccountAddressFromText = (text: string): string | null => {
83+
export const getAccountAddressFromText = (text: string): string => {
8484
const [, address] =
8585
text?.match(
8686
new RegExp(`[^sS]*?(${ACCOUNT_REGEX.toString().replace(/\//g, "")})[^sS]*?`, "i"),

src/pages/Account/History/Filters.tsx

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import moment from "moment";
2020
import { AccountHistoryFilterContext } from "api/contexts/AccountHistoryFilter";
2121
import { PreferencesContext, Theme } from "api/contexts/Preferences";
2222
import QuestionCircle from "components/QuestionCircle";
23+
import { getAccountAddressFromText, isValidAccountAddress } from "components/utils";
2324
import { TwoToneColors } from "components/utils";
2425

2526
import Export from "./Export";
@@ -181,7 +182,24 @@ const Filters: React.FC = () => {
181182
</Select>
182183
<Controller
183184
render={({ field }) => (
184-
<Input {...field} style={{ flexGrow: 1 }} placeholder="nano_" />
185+
<Input
186+
{...field}
187+
style={{ flexGrow: 1 }}
188+
placeholder="nano_"
189+
onPaste={e => {
190+
e.preventDefault();
191+
192+
// @ts-ignore
193+
const paste = (e.clipboardData || window.clipboardData).getData("text");
194+
195+
const account = getAccountAddressFromText(paste);
196+
if (isValidAccountAddress(account)) {
197+
setValue("sender", account);
198+
}
199+
200+
setValue("sender", account);
201+
}}
202+
/>
185203
)}
186204
control={control}
187205
name="sender"
@@ -227,7 +245,23 @@ const Filters: React.FC = () => {
227245
</Select>
228246
<Controller
229247
render={({ field }) => (
230-
<Input {...field} style={{ flexGrow: 1 }} placeholder="nano_" />
248+
<Input
249+
{...field}
250+
name="receiver"
251+
style={{ flexGrow: 1 }}
252+
placeholder="nano_"
253+
onPaste={e => {
254+
e.preventDefault();
255+
256+
// @ts-ignore
257+
const paste = (e.clipboardData || window.clipboardData).getData("text");
258+
259+
const account = getAccountAddressFromText(paste);
260+
if (isValidAccountAddress(account)) {
261+
setValue("receiver", account);
262+
}
263+
}}
264+
/>
231265
)}
232266
control={control}
233267
name="receiver"

0 commit comments

Comments
 (0)