From ef0be315798df3a96a85afdb1d77dc4b1e65acff Mon Sep 17 00:00:00 2001
From: olaszakos <olaszakos@gmail.com>
Date: Tue, 5 Mar 2024 11:11:12 +0100
Subject: [PATCH] feat: add description field to wallet (#151)

Enable users to add an optional summary to transfer requests. Summary
data is stored in Proposal::summary.

Updated create transfer form, it is also prepared to load and show an
existing transfer along with the summary from its proposal. To support
this I added the proposal_id to the Transfer DTO.

![image](https://github.com/dfinity/orbit-wallet/assets/9403182/fafa7ec4-6ff5-432e-88d0-dba340a9d939)

Display the summary on the Proposal details dialog:

![image](https://github.com/dfinity/orbit-wallet/assets/9403182/f0094810-1599-4613-9f30-8ddf295dd77d)
---
 .../integration-tests/src/transfer_tests.rs   |  39 +++-
 .../accounts/TransferDialog.spec.ts           | 167 ++++++++++++++++++
 .../components/accounts/TransferDialog.vue    |  76 ++++++--
 .../src/components/accounts/TransferForm.vue  |   3 +
 .../ui/src/generated/wallet/wallet.did.d.ts   |   2 +
 .../ui/src/generated/wallet/wallet.did.js     |   2 +
 canisters/ui/src/services/wallet.service.ts   |   4 +-
 canisters/wallet/api/spec.did                 |   4 +
 canisters/wallet/api/src/transfer.rs          |   2 +
 canisters/wallet/impl/src/mappers/account.rs  |  19 +-
 .../wallet/impl/src/mappers/address_book.rs   |   3 +-
 canisters/wallet/impl/src/mappers/transfer.rs |  15 +-
 12 files changed, 282 insertions(+), 54 deletions(-)
 create mode 100644 canisters/ui/src/components/accounts/TransferDialog.spec.ts

diff --git a/canisters/integration-tests/src/transfer_tests.rs b/canisters/integration-tests/src/transfer_tests.rs
index ef5ca61cb..cb63e0ac1 100644
--- a/canisters/integration-tests/src/transfer_tests.rs
+++ b/canisters/integration-tests/src/transfer_tests.rs
@@ -11,9 +11,9 @@ use std::time::Duration;
 use wallet_api::{
     AccountPoliciesDTO, AddAccountOperationInput, ApiErrorDTO, ApprovalThresholdDTO,
     CreateProposalInput, CreateProposalResponse, CriteriaDTO, GetProposalInput,
-    GetProposalResponse, ListAccountTransfersInput, ListAccountTransfersResponse, MeResponse,
-    ProposalExecutionScheduleDTO, ProposalOperationDTO, ProposalOperationInput, ProposalStatusDTO,
-    TransferOperationInput, UserSpecifierDTO,
+    GetProposalResponse, GetTransfersInput, GetTransfersResponse, ListAccountTransfersInput,
+    ListAccountTransfersResponse, MeResponse, ProposalExecutionScheduleDTO, ProposalOperationDTO,
+    ProposalOperationInput, ProposalStatusDTO, TransferOperationInput, UserSpecifierDTO,
 };
 
 #[test]
@@ -163,7 +163,7 @@ fn make_transfer_successful() {
 
     // check transfer proposal status
     let get_proposal_args = GetProposalInput {
-        proposal_id: proposal_dto.id,
+        proposal_id: proposal_dto.id.clone(),
     };
     let res: (Result<GetProposalResponse, ApiErrorDTO>,) = update_candid_as(
         &env,
@@ -185,15 +185,38 @@ fn make_transfer_successful() {
     };
 
     // proposal has the transfer id filled out
-    match new_proposal_dto.operation {
-        ProposalOperationDTO::Transfer(transfer) => {
-            transfer.transfer_id.expect("transfer id must be set")
-        }
+    let transfer_id = match new_proposal_dto.operation {
+        ProposalOperationDTO::Transfer(transfer) => transfer
+            .transfer_id
+            .expect("transfer id must be set for completed transfer"),
         _ => {
             panic!("proposal must be Transfer");
         }
     };
 
+    // fetch the transfer and check if its proposal id matches the proposal id that created it
+    let res: (Result<GetTransfersResponse, ApiErrorDTO>,) = query_candid_as(
+        &env,
+        canister_ids.wallet,
+        WALLET_ADMIN_USER,
+        "get_transfers",
+        (GetTransfersInput {
+            transfer_ids: vec![transfer_id],
+        },),
+    )
+    .unwrap();
+
+    let proposal_id_in_transfer_dto = res
+        .0
+        .unwrap()
+        .transfers
+        .first()
+        .expect("One transaction must be returned")
+        .proposal_id
+        .clone();
+
+    assert_eq!(proposal_id_in_transfer_dto, proposal_dto.id);
+
     // check beneficiary balance after completed transfer
     let new_beneficiary_balance = get_icp_balance(&env, beneficiary_id);
     assert_eq!(new_beneficiary_balance, ICP);
diff --git a/canisters/ui/src/components/accounts/TransferDialog.spec.ts b/canisters/ui/src/components/accounts/TransferDialog.spec.ts
new file mode 100644
index 000000000..9483497eb
--- /dev/null
+++ b/canisters/ui/src/components/accounts/TransferDialog.spec.ts
@@ -0,0 +1,167 @@
+import { describe, expect, it, vi } from 'vitest';
+import { mount } from '~/test.utils';
+import TransferDialog from './TransferDialog.vue';
+import { Account, GetProposalResult, Proposal, Transfer } from '~/generated/wallet/wallet.did';
+import DataLoaderVue from '../DataLoader.vue';
+import { flushPromises } from '@vue/test-utils';
+import { services } from '~/plugins/services.plugin';
+import { ExtractOk } from '~/types/helper.types';
+
+vi.mock('~/services/wallet.service', () => ({
+  WalletService: vi.fn().mockImplementation(() => {
+    return {
+      transfer: vi.fn(() => {
+        return Promise.resolve({} as Proposal);
+      }),
+    };
+  }),
+}));
+
+describe('TransferDialog', () => {
+  it('renders correctly', () => {
+    const wrapper = mount(TransferDialog, {
+      props: {
+        account: {
+          id: '1',
+          decimals: 1,
+        } as Account,
+        open: true,
+      },
+    });
+    expect(wrapper.exists()).toBe(true);
+  });
+
+  it('shows empty form when transferId not specified', async () => {
+    const wrapper = mount(TransferDialog, {
+      props: {
+        account: {
+          id: '1',
+          decimals: 1,
+        } as Account,
+        open: true,
+      },
+    });
+    await wrapper.vm.$nextTick();
+    await flushPromises();
+    await wrapper.vm.$nextTick();
+
+    const dataLoader = wrapper.findComponent(DataLoaderVue);
+    const form = dataLoader.find(`[data-test-id="transfer-dialog-form"]`);
+
+    const transferId = form.find(`[data-test-id="transfer-form-transfer-id"]`);
+    const amount = form.find(`[data-test-id="transfer-form-amount"]`);
+    const destination = form.find(`[data-test-id="transfer-form-destination-address"]`);
+    const summary = form.find(`[data-test-id="transfer-dialog-proposal-summary"]`);
+
+    // transferId should not be visible when not specified as a prop
+    expect(transferId.exists()).toBe(false);
+
+    expect(amount.exists()).toBe(true);
+    expect(destination.exists()).toBe(true);
+    expect(summary.exists()).toBe(true);
+
+    // amount field should be empty
+    expect(amount.find('input').element.value).toBe('');
+
+    // destination field should be empty
+    expect(destination.find('input').element.value).toBe('');
+
+    // summary should be empty
+    expect(summary.find('input').element.value).toBe('');
+  });
+
+  it('creates transfer proposal with summary', async () => {
+    const wrapper = mount(TransferDialog, {
+      props: {
+        account: {
+          id: '1',
+          decimals: 1,
+        } as Account,
+        open: true,
+      },
+    });
+    await wrapper.vm.$nextTick();
+    await flushPromises();
+    await wrapper.vm.$nextTick();
+
+    const dataLoader = wrapper.findComponent(DataLoaderVue);
+    const form = dataLoader.find(`[data-test-id="transfer-dialog-form"]`);
+
+    const amount = form.find(`[data-test-id="transfer-form-amount"]`);
+    const destination = form.find(`[data-test-id="transfer-form-destination-address"]`);
+    const summary = form.find(`[data-test-id="transfer-dialog-proposal-summary"]`);
+
+    const submitButton = form.find(`[data-test-id="transfer-dialog-save-button"]`);
+
+    amount.find('input').setValue('1');
+    destination.find('input').setValue('destination address');
+    summary.find('input').setValue('test summary');
+
+    await flushPromises();
+
+    await submitButton.trigger('click');
+
+    await wrapper.vm.$nextTick();
+    await flushPromises();
+
+    expect(services().wallet.transfer).toHaveBeenCalledWith(
+      expect.objectContaining({
+        amount: 10n,
+        to: 'destination address',
+      }),
+      'test summary',
+    );
+  });
+
+  it('loads the corresponding objects to display the transfer and summary if transferId is specified', async () => {
+    services().wallet.getProposal = vi.fn(() =>
+      Promise.resolve({
+        proposal: {
+          summary: ['test summary'], // it's an opt
+        } as unknown as Proposal,
+      } as ExtractOk<GetProposalResult>),
+    );
+    services().wallet.getTransfer = vi.fn(() =>
+      Promise.resolve({
+        id: 'transfer-id',
+        to: 'destination address',
+        amount: 123n,
+        proposal_id: 'proposal-id',
+      } as Transfer),
+    );
+
+    const wrapper = mount(TransferDialog, {
+      props: {
+        account: {
+          id: '1',
+          decimals: 2,
+        } as Account,
+        open: true,
+        transferId: 'transfer-id',
+      },
+    });
+    await wrapper.vm.$nextTick();
+    await flushPromises();
+    await wrapper.vm.$nextTick();
+
+    expect(services().wallet.getTransfer).toHaveBeenCalledWith('transfer-id');
+    expect(services().wallet.getProposal).toHaveBeenCalledWith({
+      proposal_id: 'proposal-id',
+    });
+
+    const dataLoader = wrapper.findComponent(DataLoaderVue);
+    const form = dataLoader.find(`[data-test-id="transfer-dialog-form"]`);
+
+    const transferId = form.find(`[data-test-id="transfer-form-transfer-id"]`);
+    const amount = form.find(`[data-test-id="transfer-form-amount"]`);
+    const destination = form.find(`[data-test-id="transfer-form-destination-address"]`);
+    const summary = form.find(`[data-test-id="transfer-dialog-proposal-summary"]`);
+
+    expect(transferId.exists()).toBe(true);
+    expect(transferId.find('input').element.value).toBe('transfer-id');
+
+    expect(amount.find('input').element.value).toBe('1.23');
+    expect(destination.find('input').element.value).toBe('destination address');
+    expect(summary.find('input').element.value).toBe('test summary');
+  });
+});
diff --git a/canisters/ui/src/components/accounts/TransferDialog.vue b/canisters/ui/src/components/accounts/TransferDialog.vue
index 8cdd820c9..af6adfe8a 100644
--- a/canisters/ui/src/components/accounts/TransferDialog.vue
+++ b/canisters/ui/src/components/accounts/TransferDialog.vue
@@ -10,9 +10,12 @@
       v-slot="{ data }"
       :load="loadTransfer"
       @loading="loading = $event"
-      @loaded="transfer = $event.transfer"
+      @loaded="
+        transfer = $event.transfer;
+        proposal = $event.proposal;
+      "
     >
-      <VCard :loading="loading">
+      <VCard :loading="loading" data-test-id="transfer-dialog-form">
         <VToolbar dark color="surface">
           <VToolbarTitle>{{ $t('terms.transfer') }}</VToolbarTitle>
           <VBtn :disabled="loading || saving" :icon="mdiClose" dark @click="openModel = false" />
@@ -23,10 +26,27 @@
             v-model="transfer"
             v-model:trigger-submit="triggerSubmit"
             :account="props.account.value"
-            :disabled="props.readonly.value"
+            :mode="props.readonly.value ? 'view' : 'edit'"
             @submit="save"
             @valid="valid = $event"
           />
+
+          <VRow>
+            <VCol :cols="12">
+              <VTextField
+                v-model="summary"
+                :label="$t('terms.summary')"
+                variant="underlined"
+                density="compact"
+                class="mb-2"
+                name="to"
+                :disabled="props.readonly.value"
+                type="text"
+                :prepend-icon="mdiComment"
+                data-test-id="transfer-dialog-proposal-summary"
+              />
+            </VCol>
+          </VRow>
         </VCardText>
         <VCardActions class="pa-3">
           <VSpacer />
@@ -34,6 +54,7 @@
             v-if="!props.readonly.value"
             :disabled="!canSave"
             :loading="saving"
+            data-test-id="transfer-dialog-save-button"
             @click="triggerSubmit = true"
           >
             {{ props.transferId.value ? $t('terms.save') : $t('terms.create') }}
@@ -44,7 +65,7 @@
   </VDialog>
 </template>
 <script lang="ts" setup>
-import { mdiClose } from '@mdi/js';
+import { mdiClose, mdiComment } from '@mdi/js';
 import { computed, ref, toRefs } from 'vue';
 import DataLoader from '~/components/DataLoader.vue';
 import TransferForm from './TransferForm.vue';
@@ -53,9 +74,9 @@ import {
   useOnSuccessfulOperation,
 } from '~/composables/notifications.composable';
 import logger from '~/core/logger.core';
-import { Account, Transfer, UUID } from '~/generated/wallet/wallet.did';
-import { useWalletStore } from '~/stores/wallet.store';
+import { Account, Proposal, Transfer, UUID } from '~/generated/wallet/wallet.did';
 import { assertAndReturn } from '~/utils/helper.utils';
+import { services } from '~/plugins/services.plugin';
 
 const input = withDefaults(
   defineProps<{
@@ -82,26 +103,40 @@ const valid = ref(true);
 const loading = ref(false);
 const saving = ref(false);
 const transfer = ref<Partial<Transfer>>({});
+const proposal = ref<Partial<Proposal>>({});
 const openModel = computed({
   get: () => props.open.value,
   set: value => emit('update:open', value),
 });
 
-const wallet = useWalletStore();
+const summary = computed({
+  get: () => proposal.value.summary?.[0],
+  set: value => {
+    proposal.value.summary = !value ? [] : [value];
+  },
+});
+
+const walletService = services().wallet;
 
 const loadTransfer = async (): Promise<{
   transfer: Partial<Transfer>;
+  proposal: Partial<Proposal>;
 }> => {
   if (props.transferId.value === undefined) {
     const createModel: Partial<Transfer> = {
       from_account_id: props.account.value.id,
     };
 
-    return { transfer: createModel };
+    return { transfer: createModel, proposal: {} };
   }
 
-  const result = await wallet.service.getTransfer(props.transferId.value);
-  return { transfer: result };
+  const transfer = await walletService.getTransfer(props.transferId.value);
+
+  const { proposal } = await walletService.getProposal({
+    proposal_id: transfer.proposal_id,
+  });
+
+  return { transfer, proposal };
 };
 
 const canSave = computed(() => {
@@ -118,16 +153,19 @@ const save = async (): Promise<void> => {
   try {
     saving.value = true;
 
-    const proposal = await wallet.service.transfer({
-      from_account_id: assertAndReturn(transfer.value.from_account_id, 'from_account_id'),
-      amount: assertAndReturn(transfer.value.amount, 'amount'),
-      to: assertAndReturn(transfer.value.to, 'to'),
-      fee: transfer.value.fee ? [transfer.value.fee] : [],
-      metadata: transfer.value.metadata ?? [],
-      network: transfer.value.network ? [transfer.value.network] : [],
-    });
+    const newProposal = await walletService.transfer(
+      {
+        from_account_id: assertAndReturn(transfer.value.from_account_id, 'from_account_id'),
+        amount: assertAndReturn(transfer.value.amount, 'amount'),
+        to: assertAndReturn(transfer.value.to, 'to'),
+        fee: transfer.value.fee ? [transfer.value.fee] : [],
+        metadata: transfer.value.metadata ?? [],
+        network: transfer.value.network ? [transfer.value.network] : [],
+      },
+      summary.value,
+    );
 
-    useOnSuccessfulOperation(proposal);
+    useOnSuccessfulOperation(newProposal);
 
     openModel.value = false;
   } catch (error) {
diff --git a/canisters/ui/src/components/accounts/TransferForm.vue b/canisters/ui/src/components/accounts/TransferForm.vue
index c2cea2aaa..7cfc5252c 100644
--- a/canisters/ui/src/components/accounts/TransferForm.vue
+++ b/canisters/ui/src/components/accounts/TransferForm.vue
@@ -8,6 +8,7 @@
       variant="plain"
       density="compact"
       :disabled="isViewMode"
+      data-test-id="transfer-form-transfer-id"
     />
     <VTextField
       v-model="model.to"
@@ -20,6 +21,7 @@
       type="text"
       :prepend-icon="mdiSend"
       :rules="[requiredRule]"
+      data-test-id="transfer-form-destination-address"
     />
     <VTextField
       ref="amountInput"
@@ -33,6 +35,7 @@
       :disabled="isViewMode"
       :prepend-icon="mdiNumeric"
       :rules="[requiredRule, v => validTokenAmount(v, account.decimals)]"
+      data-test-id="transfer-form-amount"
     />
   </VForm>
 </template>
diff --git a/canisters/ui/src/generated/wallet/wallet.did.d.ts b/canisters/ui/src/generated/wallet/wallet.did.d.ts
index e589f1602..f03a56ef8 100644
--- a/canisters/ui/src/generated/wallet/wallet.did.d.ts
+++ b/canisters/ui/src/generated/wallet/wallet.did.d.ts
@@ -656,6 +656,7 @@ export interface Transfer {
   'from_account_id' : UUID,
   'metadata' : Array<TransferMetadata>,
   'network' : Network,
+  'proposal_id' : UUID,
   'amount' : bigint,
 }
 export type TransferActionSpecifier = { 'Read' : TransferSpecifier } |
@@ -666,6 +667,7 @@ export interface TransferListItem {
   'status' : TransferStatus,
   'created_at' : TimestampRFC3339,
   'transfer_id' : UUID,
+  'proposal_id' : UUID,
   'amount' : bigint,
 }
 export interface TransferMetadata { 'key' : string, 'value' : string }
diff --git a/canisters/ui/src/generated/wallet/wallet.did.js b/canisters/ui/src/generated/wallet/wallet.did.js
index b71322ac9..dddace5e4 100644
--- a/canisters/ui/src/generated/wallet/wallet.did.js
+++ b/canisters/ui/src/generated/wallet/wallet.did.js
@@ -530,6 +530,7 @@ export const idlFactory = ({ IDL }) => {
     'from_account_id' : UUID,
     'metadata' : IDL.Vec(TransferMetadata),
     'network' : Network,
+    'proposal_id' : UUID,
     'amount' : IDL.Nat,
   });
   const GetTransfersResult = IDL.Variant({
@@ -612,6 +613,7 @@ export const idlFactory = ({ IDL }) => {
     'status' : TransferStatus,
     'created_at' : TimestampRFC3339,
     'transfer_id' : UUID,
+    'proposal_id' : UUID,
     'amount' : IDL.Nat,
   });
   const ListAccountTransfersResult = IDL.Variant({
diff --git a/canisters/ui/src/services/wallet.service.ts b/canisters/ui/src/services/wallet.service.ts
index e1ddb14fe..4820669f9 100644
--- a/canisters/ui/src/services/wallet.service.ts
+++ b/canisters/ui/src/services/wallet.service.ts
@@ -659,11 +659,11 @@ export class WalletService {
     return result.Ok.proposal;
   }
 
-  async transfer(input: TransferOperationInput): Promise<Proposal> {
+  async transfer(input: TransferOperationInput, summary?: string): Promise<Proposal> {
     const result = await this.actor.create_proposal({
       execution_plan: [{ Immediate: null }],
       title: [],
-      summary: [],
+      summary: summary ? [summary] : [],
       operation: { Transfer: input },
     });
 
diff --git a/canisters/wallet/api/spec.did b/canisters/wallet/api/spec.did
index e8b443fe3..ed002a852 100644
--- a/canisters/wallet/api/spec.did
+++ b/canisters/wallet/api/spec.did
@@ -923,6 +923,8 @@ type ListAccountTransfersInput = record {
 type TransferListItem = record {
   // The transfer id.
   transfer_id : UUID;
+  // The id of the proposal that created the transfer.
+  proposal_id : UUID;
   // The destination address of the transaction (e.g. "1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2").
   to : text;
   // The amount to transfer.
@@ -1052,6 +1054,8 @@ type TransferStatusType = variant {
 type Transfer = record {
   // The internal transfer id, this a unique identifier for the transfer.
   id : UUID;
+  // The id of the proposal that created the transfer.
+  proposal_id : UUID;
   // The account id to use for the transfer.
   from_account_id : UUID;
   // The destination address of the transaction (e.g. "1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2").
diff --git a/canisters/wallet/api/src/transfer.rs b/canisters/wallet/api/src/transfer.rs
index d905c5e85..da5394be6 100644
--- a/canisters/wallet/api/src/transfer.rs
+++ b/canisters/wallet/api/src/transfer.rs
@@ -55,6 +55,7 @@ pub enum TransferStatusTypeDTO {
 #[derive(CandidType, Deserialize, Debug, Clone)]
 pub struct TransferDTO {
     pub id: UuidDTO,
+    pub proposal_id: UuidDTO,
     pub from_account_id: UuidDTO,
     pub to: String,
     pub fee: candid::Nat,
@@ -90,6 +91,7 @@ pub struct ListAccountTransfersInput {
 #[derive(CandidType, Deserialize, Debug, Clone)]
 pub struct TransferListItemDTO {
     pub transfer_id: UuidDTO,
+    pub proposal_id: UuidDTO,
     pub status: TransferStatusDTO,
     pub to: String,
     pub amount: candid::Nat,
diff --git a/canisters/wallet/impl/src/mappers/account.rs b/canisters/wallet/impl/src/mappers/account.rs
index 3f974ece8..2f7022f29 100644
--- a/canisters/wallet/impl/src/mappers/account.rs
+++ b/canisters/wallet/impl/src/mappers/account.rs
@@ -17,10 +17,7 @@ pub struct AccountMapper {}
 impl AccountMapper {
     pub fn to_dto(account: Account) -> AccountDTO {
         AccountDTO {
-            id: Uuid::from_slice(&account.id)
-                .unwrap()
-                .hyphenated()
-                .to_string(),
+            id: Uuid::from_bytes(account.id).hyphenated().to_string(),
             name: account.name,
             decimals: account.decimals,
             balance: match account.balance {
@@ -38,13 +35,8 @@ impl AccountMapper {
             address: account.address,
             owners: account
                 .owners
-                .iter()
-                .map(|owner_id| {
-                    Uuid::from_slice(owner_id.as_slice())
-                        .unwrap()
-                        .hyphenated()
-                        .to_string()
-                })
+                .into_iter()
+                .map(|owner_id| Uuid::from_bytes(owner_id).hyphenated().to_string())
                 .collect(),
             standard: account.standard.to_string(),
             blockchain: account.blockchain.to_string(),
@@ -120,10 +112,7 @@ impl AccountMapper {
         account_id: AccountId,
     ) -> AccountBalanceDTO {
         AccountBalanceDTO {
-            account_id: Uuid::from_slice(&account_id)
-                .unwrap()
-                .hyphenated()
-                .to_string(),
+            account_id: Uuid::from_bytes(account_id).hyphenated().to_string(),
             balance: balance.balance,
             decimals,
             last_update_timestamp: timestamp_to_rfc3339(&balance.last_modification_timestamp),
diff --git a/canisters/wallet/impl/src/mappers/address_book.rs b/canisters/wallet/impl/src/mappers/address_book.rs
index 052b64483..35f6ef1bc 100644
--- a/canisters/wallet/impl/src/mappers/address_book.rs
+++ b/canisters/wallet/impl/src/mappers/address_book.rs
@@ -19,8 +19,7 @@ pub struct AddressBookMapper {}
 impl AddressBookMapper {
     pub fn to_dto(address_book_entry: AddressBookEntry) -> AddressBookEntryDTO {
         AddressBookEntryDTO {
-            id: Uuid::from_slice(&address_book_entry.id)
-                .unwrap()
+            id: Uuid::from_bytes(address_book_entry.id)
                 .hyphenated()
                 .to_string(),
             address_owner: address_book_entry.address_owner,
diff --git a/canisters/wallet/impl/src/mappers/transfer.rs b/canisters/wallet/impl/src/mappers/transfer.rs
index dd887cc84..2c64b6de0 100644
--- a/canisters/wallet/impl/src/mappers/transfer.rs
+++ b/canisters/wallet/impl/src/mappers/transfer.rs
@@ -9,8 +9,8 @@ pub struct TransferMapper {}
 impl TransferMapper {
     pub fn to_dto(transfer: Transfer) -> TransferDTO {
         TransferDTO {
-            id: Uuid::from_slice(&transfer.id)
-                .unwrap()
+            id: Uuid::from_bytes(transfer.id).hyphenated().to_string(),
+            proposal_id: Uuid::from_bytes(transfer.proposal_id)
                 .hyphenated()
                 .to_string(),
             amount: transfer.amount,
@@ -20,8 +20,7 @@ impl TransferMapper {
                 id: transfer.blockchain_network.to_owned(),
                 name: transfer.blockchain_network.to_owned(),
             },
-            from_account_id: Uuid::from_slice(&transfer.from_account)
-                .unwrap()
+            from_account_id: Uuid::from_bytes(transfer.from_account)
                 .hyphenated()
                 .to_string(),
             to: transfer.to_address,
@@ -31,14 +30,14 @@ impl TransferMapper {
 
     pub fn to_list_item_dto(transfer: Transfer) -> TransferListItemDTO {
         TransferListItemDTO {
-            transfer_id: Uuid::from_slice(&transfer.id)
-                .unwrap()
-                .hyphenated()
-                .to_string(),
+            transfer_id: Uuid::from_bytes(transfer.id).hyphenated().to_string(),
             amount: transfer.amount,
             to: transfer.to_address,
             created_at: timestamp_to_rfc3339(&transfer.created_timestamp),
             status: transfer.status.into(),
+            proposal_id: Uuid::from_bytes(transfer.proposal_id)
+                .hyphenated()
+                .to_string(),
         }
     }
 }