Skip to content

feat: Add IN/OUT Status and Validation for Identical Payee and Payer Addresses #262

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
sstefdev merged 7 commits into from
Dec 18, 2024
Merged

feat: Add IN/OUT Status and Validation for Identical Payee and Payer Addresses #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
472c95a
feat: added new transaction status, validation when the payee and pay…
sstefdev Dec 17, 2024
aa9d177
fix: optimized the code
sstefdev Dec 17, 2024
c41a97b
Merge branch 'main' of github.com:RequestNetwork/web-components into …
sstefdev Dec 17, 2024
799781c
fix: update tx type component, change the error message
sstefdev Dec 17, 2024
868778a
Merge branch 'main' of github.com:RequestNetwork/web-components into …
sstefdev Dec 18, 2024
4f74286
fix: add undefined check for addresses
sstefdev Dec 18, 2024
8891015
Merge branch 'main' into 247-request-invoicing---handle-inout-for-req…
sstefdev Dec 18, 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
14 changes: 13 additions & 1 deletion packages/create-invoice-form/src/lib/invoice/form.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
let validationErrors = {
payeeAddress: false,
clientAddress: false,
sameAddress: false,
sellerInfo: {
email: false,
},
Expand All @@ -58,12 +59,21 @@
validationErrors[`${type}`].email = !isEmail(email);
};

const checkSameAddress = () => {
return (
formData.payerAddress?.toLowerCase() ===
formData.payeeAddress?.toLowerCase()
);
};

const checkPayeeAddress = () => {
validationErrors.payeeAddress = !checkAddress(formData.payeeAddress);
validationErrors.sameAddress = checkSameAddress();
};

const checkClientAddress = () => {
validationErrors.clientAddress = !checkAddress(formData.payerAddress);
validationErrors.sameAddress = checkSameAddress();
};

const calculateInputWidth = (value: string) => {
Expand Down Expand Up @@ -338,7 +348,9 @@
onBlur={checkClientAddress}
error={validationErrors.clientAddress
? "Please enter a valid Ethereum address"
: ""}
: validationErrors.sameAddress
? "Payer address cannot be the same as Payee address"
: ""}
/>
<Accordion title="Add Client Info">
<div class="invoice-form-info">
Expand Down
1 change: 1 addition & 0 deletions packages/invoice-dashboard/src/lib/view-requests.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,7 @@
<td>
<TxType
type={signer === request.payer?.value ? "OUT" : "IN"}
showBoth={request.payer?.value === request.payee?.value}
/>
</td>
<td><StatusLabel status={checkStatus(request)} /></td>
Expand Down
57 changes: 53 additions & 4 deletions shared/components/tx-type.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,56 @@
<script lang="ts">
export let type: "IN" | "OUT";
export let showBoth: boolean = false;

$: isOut = type === "OUT";
</script>

<div class="tx" class:out={isOut} class:in={!isOut}>
{type}
</div>
{#if showBoth}
<div class="tx-group">
<div class="tx in overlap">IN</div>
<div class="tx out overlap">OUT</div>
</div>
{:else}
<div class="tx" class:out={isOut} class:in={!isOut}>
{type}
</div>
{/if}

<style>
.tx-group {
position: relative;
display: inline-flex;
align-items: center;
margin-bottom: 6px;
}

.tx {
padding: 8px 0px;
padding: 6px 0px;
border-radius: 6px;
font-size: 12px;
font-weight: 600;
max-width: 40px;
width: 100%;
text-align: center;
position: relative;
overflow: hidden;
}

.tx::before {
content: "";
position: absolute;
top: 0;
left: 0;
width: 200%;
height: 200%;
background: repeating-linear-gradient(
45deg,
transparent,
transparent 5px,
rgba(255, 255, 255, 0.1) 5px,
rgba(255, 255, 255, 0.1) 10px
);
z-index: 1;
}

.out {
Expand All @@ -28,4 +62,19 @@
background-color: rgba(11, 180, 137, 0.25);
color: #01503a;
}

.overlap {
width: 120px;
position: absolute;
}

.overlap.in {
left: -14px;
background-color: rgba(11, 180, 137, 0.35);
}

.overlap.out {
left: 14px;
background-color: rgba(255, 197, 49, 0.35);
}
</style>
Loading