From c017e787ff4b4c377105bf781c0970a4b1d2bc43 Mon Sep 17 00:00:00 2001 From: patnorris Date: Sun, 25 Feb 2024 15:33:17 +0100 Subject: [PATCH] Add personal note to donation record view if it exists --- .../donation_tracker_canister.did | 3 ++- .../donation_tracker_canister.did.d.ts | 3 ++- .../donation_tracker_canister.did.js | 3 ++- .../src/donation_frontend/components/DonationRecord.svelte | 7 ++++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/frontend/src/declarations/donation_tracker_canister/donation_tracker_canister.did b/frontend/src/declarations/donation_tracker_canister/donation_tracker_canister.did index c8279d9..0277bdc 100644 --- a/frontend/src/declarations/donation_tracker_canister/donation_tracker_canister.did +++ b/frontend/src/declarations/donation_tracker_canister/donation_tracker_canister.did @@ -144,6 +144,7 @@ type DonationTracker = getTxidstext: () -> (TxidstextResult); getUTXOS: () -> (GetUtxosResponseResult); initRecipients: () -> (InitRecipientsResult); + isControllerLogicOk: () -> (AuthRecordResult); listRecipients: (RecipientFilter) -> (RecipientsResult) query; makeDonation: (DonationRecord) -> (DtiResult); submitSignUpForm: (SignUpFormInput) -> (text); @@ -190,7 +191,7 @@ type Donation = allocation: DonationCategories; donor: DonorType; dti: DTI; - hasBeenDistributed: bool; + hasBeenDistributed: opt bool; paymentTransactionId: PaymentTransactionId; paymentType: PaymentType; personalNote: opt text; diff --git a/frontend/src/declarations/donation_tracker_canister/donation_tracker_canister.did.d.ts b/frontend/src/declarations/donation_tracker_canister/donation_tracker_canister.did.d.ts index 7f0459c..c1cd677 100644 --- a/frontend/src/declarations/donation_tracker_canister/donation_tracker_canister.did.d.ts +++ b/frontend/src/declarations/donation_tracker_canister/donation_tracker_canister.did.d.ts @@ -27,7 +27,7 @@ export interface Donation { 'dti' : DTI, 'rewardsHaveBeenClaimed' : boolean, 'paymentTransactionId' : PaymentTransactionId, - 'hasBeenDistributed' : boolean, + 'hasBeenDistributed' : [] | [boolean], 'totalAmount' : Satoshi, 'timestamp' : bigint, 'paymentType' : PaymentType, @@ -87,6 +87,7 @@ export interface DonationTracker { 'getTxidstext' : ActorMethod<[], TxidstextResult>, 'getUTXOS' : ActorMethod<[], GetUtxosResponseResult>, 'initRecipients' : ActorMethod<[], InitRecipientsResult>, + 'isControllerLogicOk' : ActorMethod<[], AuthRecordResult>, 'listRecipients' : ActorMethod<[RecipientFilter], RecipientsResult>, 'makeDonation' : ActorMethod<[DonationRecord], DtiResult>, 'submitSignUpForm' : ActorMethod<[SignUpFormInput], string>, diff --git a/frontend/src/declarations/donation_tracker_canister/donation_tracker_canister.did.js b/frontend/src/declarations/donation_tracker_canister/donation_tracker_canister.did.js index caf9f6a..a2c5db8 100644 --- a/frontend/src/declarations/donation_tracker_canister/donation_tracker_canister.did.js +++ b/frontend/src/declarations/donation_tracker_canister/donation_tracker_canister.did.js @@ -42,7 +42,7 @@ export const idlFactory = ({ IDL }) => { 'dti' : DTI, 'rewardsHaveBeenClaimed' : IDL.Bool, 'paymentTransactionId' : PaymentTransactionId, - 'hasBeenDistributed' : IDL.Bool, + 'hasBeenDistributed' : IDL.Opt(IDL.Bool), 'totalAmount' : Satoshi, 'timestamp' : IDL.Nat64, 'paymentType' : PaymentType, @@ -220,6 +220,7 @@ export const idlFactory = ({ IDL }) => { 'getTxidstext' : IDL.Func([], [TxidstextResult], []), 'getUTXOS' : IDL.Func([], [GetUtxosResponseResult], []), 'initRecipients' : IDL.Func([], [InitRecipientsResult], []), + 'isControllerLogicOk' : IDL.Func([], [AuthRecordResult], []), 'listRecipients' : IDL.Func( [RecipientFilter], [RecipientsResult], diff --git a/frontend/src/donation_frontend/components/DonationRecord.svelte b/frontend/src/donation_frontend/components/DonationRecord.svelte index ab3bf60..b2788a3 100644 --- a/frontend/src/donation_frontend/components/DonationRecord.svelte +++ b/frontend/src/donation_frontend/components/DonationRecord.svelte @@ -15,7 +15,7 @@
-
+

Total Amount: {donation.totalAmount} {Object.keys(donation.paymentType)[0] === "BTC" ? "Satoshi" : ""}

Payment Type: {Object.keys(donation.paymentType)[0]}

{#if Object.keys(donation.paymentType)[0] === "BTC"} @@ -44,6 +44,11 @@ {#each Object.entries(donation.allocation) as [category, categoryValues], index}

{categoryNameTranslator[category]}: {categoryValues}

{/each} + {#if donation.personalNote[0]} + +

Personal Note: {donation.personalNote[0]}

+
+ {/if}