Skip to content
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

Jump to bottom

fix(bridge-ui-v2): NFT Id input should only allow numbers #15504

Merged
merged 5 commits into from
Jan 17, 2024
Merged

fix(bridge-ui-v2): NFT Id input should only allow numbers #15504

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ba2fcf
idinput only allows numbers
KorbinianK Jan 15, 2024
7cfc4d4
fix
KorbinianK Jan 15, 2024
a59c8b9
fix
KorbinianK Jan 15, 2024
b624beb
additional check for number IDs before checking ownership
KorbinianK Jan 17, 2024
f2bf3e5
i18n
KorbinianK Jan 17, 2024
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
35 changes: 17 additions & 18 deletions packages/bridge-ui-v2/src/components/Bridge/IDInput/IDInput.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

export let validIdNumbers: number[] = [];
export let isDisabled = false;
export let enteredIds: string = '';
export let enteredIds: number[] = [];
export let limit = 1;
export let state: State = State.DEFAULT;

export const clearIds = () => {
enteredIds = '';
enteredIds = [];
validIdNumbers = [];
dispatch('inputValidation');
};
Expand All @@ -23,25 +23,26 @@

let inputId = `input-${uid()}`;

function validateInput(idInput: EventTarget | string | null = null) {
function validateInput(idInput: EventTarget | number[] | null = null) {
state = State.VALIDATING;

if (!idInput) return;
let ids;
let ids: number[] = [];
if (idInput && idInput instanceof EventTarget) {
ids = (idInput as HTMLInputElement).value.replace(/\s+/g, '');
} else {
ids = idInput as string;
ids = (idInput as HTMLInputElement).value
.split(',')
.map((item) => parseInt(item))
.filter((num) => !isNaN(num));
} else if (Array.isArray(idInput)) {
ids = idInput;
}

const inputArray = ids.split(',');
if (inputArray.length > limit) {
ids = inputArray.slice(0, limit).join(',');
if (ids.length > limit) {
ids = ids.slice(0, limit);
}
enteredIds = ids;
const isValid = inputArray.every((item) => /^[0-9]+$/.test(item));
validIdNumbers = isValid ? inputArray.map((num) => parseInt(num)).filter(Boolean) : [];
state = State.VALID;
const isValid = ids.every((num) => Number.isInteger(num));
validIdNumbers = isValid ? ids : [];
state = isValid ? State.VALID : State.INVALID;
dispatch('inputValidation');
}

Expand All @@ -60,13 +61,11 @@
<input
id={inputId}
disabled={isDisabled}
type="text"
type="number"
placeholder={$t('inputs.token_id_input.placeholder')}
bind:value={enteredIds}
on:input={(e) => validateInput(e.target)}
class="w-full input-box withValdiation py-6 pr-16 px-[26px] title-subsection-bold placeholder:text-tertiary-content {typeClass} {$$props.class}
" />
<!-- /*state === State.Valid ? 'success' : state === State.Invalid ? 'error' : '' -->
class="w-full input-box withValdiation py-6 pr-16 px-[26px] title-subsection-bold placeholder:text-tertiary-content {typeClass} {$$props.class}" />
<button class="absolute right-6 uppercase body-bold text-secondary-content" on:click={clearIds}>
<Icon type="x-close-circle" fillClass="fill-primary-icon" size={24} />
</button>
Expand Down
9 changes: 5 additions & 4 deletions packages/bridge-ui-v2/src/components/Bridge/NFTBridgeSteps/ImportStep.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

export const prefetchImage = () => noop();

let enteredIds: string = '';
let enteredIds: number[] = [];
let scanning: boolean;

let addressInputComponent: AddressInput;
Expand All @@ -71,7 +71,7 @@

const reset = () => {
nftView = NFTView.LIST;
enteredIds = '';
enteredIds = [];
isOwnerOfAllToken = false;
detectedTokenType = null;
};
Expand Down Expand Up @@ -144,7 +144,7 @@
validating = true;

try {
if (canValidateIdInput) {
if (canValidateIdInput && enteredIds && enteredIds.length > 0) {
const tokenId = nftIdArray[0]; // Handle multiple tokens if needed

const ownershipResults = await checkOwnership(
Expand Down Expand Up @@ -248,7 +248,7 @@
}

$: canImport = $account?.isConnected && $network?.id && $destinationChain && !scanning;
$: canValidateIdInput = isAddress(contractAddress) && $network?.id && $account?.address && enteredIds.length > 0;
$: canValidateIdInput = isAddress(contractAddress) && $network?.id && $account?.address;

$: isDisabled = idInputState !== IDInputState.VALID || addressInputState !== AddressInputState.VALID;

Expand All @@ -258,6 +258,7 @@
$selectedNFTs &&
$selectedNFTs.length > 0 &&
$selectedNFTs[0].type === TokenType.ERC1155 &&
enteredIds &&
enteredIds.length > 0 &&
!validating;

Expand Down
4 changes: 2 additions & 2 deletions packages/bridge-ui-v2/src/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
"id": "ID",
"loading": "Loading",
"name": "Name",
"ok": "Ok",
"ok": "Okay",
"status": "Status",
"success": "Success",
"to": "To",
Expand Down Expand Up @@ -266,7 +266,7 @@
"invalid": "Not a valid numeric value"
},
"label": "Token ID",
"placeholder": "1 or 5,14,733"
"placeholder": "e.g. 1 (only numbers)"
}
},
"messages": {
Expand Down
Loading