Add personal note to donation record view if it exists

patnorris · Feb 25, 2024 · c017e78 · c017e78
1 parent 3d8f822
commit c017e78
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 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
@@ -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
@@ -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
@@ -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
@@ -15,7 +15,7 @@
 </script>
 
 <div class="text-gray-900 dark:text-gray-200">
-  <div>
+  <div class="pb-6 space-y-2">
     <p>Total Amount: {donation.totalAmount} {Object.keys(donation.paymentType)[0] === "BTC" ? "Satoshi" : ""}</p>
     <p>Payment Type: {Object.keys(donation.paymentType)[0]}</p>
     {#if Object.keys(donation.paymentType)[0] === "BTC"}
@@ -44,6 +44,11 @@
     {#each Object.entries(donation.allocation) as [category, categoryValues], index}
       <p>{categoryNameTranslator[category]}: {categoryValues}</p>
     {/each}
+    {#if donation.personalNote[0]}
+      <span class="inline-block break-all">
+        <p>Personal Note: {donation.personalNote[0]}</p>
+      </span>      
+    {/if}
   </div>
   <RecipientProfile recipientId={donation.recipientId} embedded={false} />
 </div>