Skip to content

Commit b182a1f

Browse files
MiguelLZPFthemariofrancia
authored andcommitted
refactor: rename beneficiaries proceed recipients (#669)
Signed-off-by: Miguel_LZPF <[email protected]> Signed-off-by: Mario Francia <[email protected]>
1 parent 5fe8125 commit b182a1f

File tree

113 files changed

+2011
-1986
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+2011
-1986
lines changed

apps/ats/web/src/hooks/mutations/useBeneficiaries.tsx renamed to apps/ats/web/src/hooks/mutations/useProceedRecipients.tsx

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
import { useMutation, useQueryClient } from '@tanstack/react-query';
22
import SDKService from '../../services/SDKService';
33
import {
4-
AddBeneficiaryRequest,
5-
RemoveBeneficiaryRequest,
6-
UpdateBeneficiaryDataRequest,
4+
AddProceedRecipientRequest,
5+
RemoveProceedRecipientRequest,
6+
UpdateProceedRecipientDataRequest,
77
} from '@hashgraph/asset-tokenization-sdk';
88
import { useToast } from 'io-bricks-ui';
99
import { useTranslation } from 'react-i18next';
10-
import { GET_BENEFICIARY_LIST } from '../queries/useBeneficiaries';
10+
import { GET_PROCEED_RECIPIENT_LIST } from '../queries/useProceedRecipients';
1111

12-
export const useAddBeneficiary = () => {
12+
export const useAddProceedRecipient = () => {
1313
const queryClient = useQueryClient();
1414
const toast = useToast();
1515
const { t } = useTranslation('security', {
16-
keyPrefix: 'details.beneficiaries.create.messages',
16+
keyPrefix: 'details.proceedRecipients.create.messages',
1717
});
1818

1919
return useMutation(
20-
(req: AddBeneficiaryRequest) => SDKService.addBeneficiary(req),
20+
(req: AddProceedRecipientRequest) => SDKService.addProceedRecipient(req),
2121
{
2222
onSuccess(data, variables) {
2323
queryClient.invalidateQueries({
24-
queryKey: [GET_BENEFICIARY_LIST(variables.securityId)],
24+
queryKey: [GET_PROCEED_RECIPIENT_LIST(variables.securityId)],
2525
});
2626

2727
console.log(
28-
'SDK message --> Add beneficiary operation success: ',
28+
'SDK message --> Add proceed recipient operation success: ',
2929
data,
3030
);
3131

@@ -42,7 +42,10 @@ export const useAddBeneficiary = () => {
4242
});
4343
},
4444
onError: (error) => {
45-
console.log('SDK message --> Add beneficiary operation error: ', error);
45+
console.log(
46+
'SDK message --> Add proceed recipient operation error: ',
47+
error,
48+
);
4649

4750
toast.show({
4851
duration: 3000,
@@ -56,24 +59,24 @@ export const useAddBeneficiary = () => {
5659
);
5760
};
5861

59-
export const useUpdateBeneficiary = () => {
62+
export const useUpdateProceedRecipient = () => {
6063
const queryClient = useQueryClient();
6164
const toast = useToast();
6265
const { t } = useTranslation('security', {
63-
keyPrefix: 'details.beneficiaries.update.messages',
66+
keyPrefix: 'details.proceedRecipients.update.messages',
6467
});
6568

6669
return useMutation(
67-
(req: UpdateBeneficiaryDataRequest) =>
68-
SDKService.updateBeneficiaryData(req),
70+
(req: UpdateProceedRecipientDataRequest) =>
71+
SDKService.updateProceedRecipientData(req),
6972
{
7073
onSuccess(data, variables) {
7174
queryClient.invalidateQueries({
72-
queryKey: [GET_BENEFICIARY_LIST(variables.securityId)],
75+
queryKey: [GET_PROCEED_RECIPIENT_LIST(variables.securityId)],
7376
});
7477

7578
console.log(
76-
'SDK message --> Update beneficiary operation success: ',
79+
'SDK message --> Update proceed recipient operation success: ',
7780
data,
7881
);
7982

@@ -91,7 +94,7 @@ export const useUpdateBeneficiary = () => {
9194
},
9295
onError: (error) => {
9396
console.log(
94-
'SDK message --> Update beneficiary operation error: ',
97+
'SDK message --> Update proceed recipient operation error: ',
9598
error,
9699
);
97100

@@ -107,23 +110,24 @@ export const useUpdateBeneficiary = () => {
107110
);
108111
};
109112

110-
export const useRemoveBeneficiary = () => {
113+
export const useRemoveProceedRecipient = () => {
111114
const queryClient = useQueryClient();
112115
const toast = useToast();
113116
const { t } = useTranslation('security', {
114-
keyPrefix: 'details.beneficiaries.remove.messages',
117+
keyPrefix: 'details.proceedRecipients.remove.messages',
115118
});
116119

117120
return useMutation(
118-
(req: RemoveBeneficiaryRequest) => SDKService.removeBeneficiary(req),
121+
(req: RemoveProceedRecipientRequest) =>
122+
SDKService.removeProceedRecipient(req),
119123
{
120124
onSuccess(data, variables) {
121125
queryClient.invalidateQueries({
122-
queryKey: [GET_BENEFICIARY_LIST(variables.securityId)],
126+
queryKey: [GET_PROCEED_RECIPIENT_LIST(variables.securityId)],
123127
});
124128

125129
console.log(
126-
'SDK message --> Remove beneficiary operation success: ',
130+
'SDK message --> Remove proceed recipient operation success: ',
127131
data,
128132
);
129133

@@ -141,7 +145,7 @@ export const useRemoveBeneficiary = () => {
141145
},
142146
onError: (error) => {
143147
console.log(
144-
'SDK message --> Remove beneficiary operation error: ',
148+
'SDK message --> Remove proceed recipient operation error: ',
145149
error,
146150
);
147151

apps/ats/web/src/hooks/queries/useBeneficiaries.ts renamed to apps/ats/web/src/hooks/queries/useProceedRecipients.ts

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -206,69 +206,69 @@
206206
import { useQuery, UseQueryOptions } from '@tanstack/react-query';
207207
import SDKService from '../../services/SDKService';
208208
import {
209-
GetBeneficiariesCountRequest,
210-
GetBeneficiariesRequest,
211-
GetBeneficiaryDataRequest,
209+
GetProceedRecipientsCountRequest,
210+
GetProceedRecipientsRequest,
211+
GetProceedRecipientDataRequest,
212212
} from '@hashgraph/asset-tokenization-sdk';
213213

214-
export interface BeneficiaryDataViewModelResponse {
214+
export interface ProceedRecipientDataViewModelResponse {
215215
address: string;
216216
data?: string;
217217
}
218218

219-
export const GET_BENEFICIARY_LIST = (securityId: string) =>
220-
`GET_BENEFICIARY_LIST_${securityId}`;
219+
export const GET_PROCEED_RECIPIENT_LIST = (securityId: string) =>
220+
`GET_PROCEED_RECIPIENT_LIST_${securityId}`;
221221

222-
export const IS_INTERNAL_BENEFICIARY_ACTIVATED = (securityId: string) =>
223-
`IS_INTERNAL_BENEFICIARY_ACTIVATED_${securityId}`;
222+
export const IS_INTERNAL_PROCEED_RECIPIENT_ACTIVATED = (securityId: string) =>
223+
`IS_INTERNAL_PROCEED_RECIPIENT_ACTIVATED_${securityId}`;
224224

225-
export const useGetBeneficiaryList = (
226-
request: GetBeneficiariesCountRequest,
225+
export const useGetProceedRecipientList = (
226+
request: GetProceedRecipientsCountRequest,
227227
options?: UseQueryOptions<
228-
BeneficiaryDataViewModelResponse[],
228+
ProceedRecipientDataViewModelResponse[],
229229
unknown,
230-
BeneficiaryDataViewModelResponse[],
230+
ProceedRecipientDataViewModelResponse[],
231231
string[]
232232
>,
233233
) => {
234234
return useQuery(
235-
[GET_BENEFICIARY_LIST(request.securityId)],
235+
[GET_PROCEED_RECIPIENT_LIST(request.securityId)],
236236
async () => {
237237
try {
238-
const beneficiariesCount =
239-
await SDKService.getBeneficiariesCount(request);
238+
const proceedRecipientsCount =
239+
await SDKService.getProceedRecipientsCount(request);
240240

241-
const beneficiaries = await SDKService.getBeneficiaries(
242-
new GetBeneficiariesRequest({
241+
const proceedRecipients = await SDKService.getProceedRecipients(
242+
new GetProceedRecipientsRequest({
243243
securityId: request.securityId,
244244
pageIndex: 0,
245-
pageSize: beneficiariesCount ?? 100,
245+
pageSize: proceedRecipientsCount ?? 100,
246246
}),
247247
);
248248

249-
const beneficiariesWithData = await Promise.all(
250-
beneficiaries.map(async (beneficiary) => {
249+
const proceedRecipientsWithData = await Promise.all(
250+
proceedRecipients.map(async (proceedRecipient) => {
251251
try {
252-
const data = await SDKService.getBeneficiaryData(
253-
new GetBeneficiaryDataRequest({
252+
const data = await SDKService.getProceedRecipientData(
253+
new GetProceedRecipientDataRequest({
254254
securityId: request.securityId,
255-
beneficiaryId: beneficiary,
255+
proceedRecipientId: proceedRecipient,
256256
}),
257257
);
258258
return {
259-
address: beneficiary,
259+
address: proceedRecipient,
260260
data,
261-
} as BeneficiaryDataViewModelResponse;
261+
} as ProceedRecipientDataViewModelResponse;
262262
} catch (error) {
263-
console.error('Error fetching beneficiary data', error);
264-
return { address: beneficiary, data: undefined };
263+
console.error('Error fetching proceed recipient data', error);
264+
return { address: proceedRecipient, data: undefined };
265265
}
266266
}),
267267
);
268268

269-
return beneficiariesWithData;
269+
return proceedRecipientsWithData;
270270
} catch (error) {
271-
console.error('Error fetching beneficiaries', error);
271+
console.error('Error fetching proceed recipients', error);
272272
throw error;
273273
}
274274
},

apps/ats/web/src/i18n/en/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ export default {
326326
internalKYCManager: 'Internal KYC Manager role',
327327
freezer: 'Freeze Manager Role',
328328
trexOwner: 'TREX Owner Role',
329-
beneficiaryManager: 'Beneficiary Manager Role',
329+
proceedRecipientManager: 'Proceed Recipient Manager Role',
330330
},
331331
landing,
332332
routes,

apps/ats/web/src/i18n/en/security/createBond.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,9 @@ export default {
293293
totalCoupons: 'Total coupons',
294294
},
295295

296-
stepBeneficiaries: {
297-
title: 'Beneficiaries',
298-
subtitle: 'Add beneficiaries',
296+
stepProceedRecipients: {
297+
title: 'Proceed Recipients',
298+
subtitle: 'Add proceed recipients',
299299
mandatoryFields: '*Mandatory fields',
300300
address: 'Address',
301301
addressPlaceholder: '0.0.1234567',
@@ -304,7 +304,7 @@ export default {
304304
invalidHederaId: 'Invalid Hedera ID',
305305
actions: 'Actions',
306306
invalidHexFormat: 'Invalid hex format',
307-
addBeneficiary: 'Add beneficiary',
307+
addProceedRecipient: 'Add proceed recipient',
308308
},
309309

310310
stepERC3643: {

apps/ats/web/src/i18n/en/security/details.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ import clearingOperations from './clearingOperations';
219219
import externalPause from './externalPause';
220220
import externalControl from './externalControl';
221221
import externalKYC from './externalKYC';
222-
import beneficiaries from './beneficiaries';
222+
import proceedRecipients from './proceedRecipients';
223223

224224
export default {
225225
header: {
@@ -250,7 +250,7 @@ export default {
250250
externalPause: 'External Pause',
251251
externalKYCList: 'External KYC',
252252
freeze: 'Freeze',
253-
beneficiaries: 'Beneficiaries',
253+
proceedRecipients: 'Proceed Recipients',
254254
},
255255
actions: {
256256
redeem: 'Redeem',
@@ -311,7 +311,7 @@ export default {
311311
externalPause,
312312
externalControl,
313313
externalKYC,
314-
beneficiaries,
314+
proceedRecipients,
315315
benefits: {
316316
dividends: 'Dividends',
317317
balanceAdjustments: 'Balance Adjustments',

apps/ats/web/src/i18n/en/security/beneficiaries.ts renamed to apps/ats/web/src/i18n/en/security/proceedRecipients.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@
204204
*/
205205

206206
export default {
207-
title: 'Beneficiaries',
208-
subtitle: 'List of beneficiaries of the bond',
207+
title: 'Proceed Recipients',
208+
subtitle: 'List of proceed recipients of the bond',
209209
add: 'Add',
210210
table: {
211211
fields: {
@@ -217,8 +217,8 @@ export default {
217217
},
218218
},
219219
create: {
220-
title: 'Add Beneficiary',
221-
description: 'Fill in the form below to add a beneficiary',
220+
title: 'Add Proceed Recipient',
221+
description: 'Fill in the form below to add a proceed recipient',
222222
form: {
223223
address: {
224224
label: 'Address',
@@ -236,14 +236,14 @@ export default {
236236
},
237237
messages: {
238238
success: 'Success: ',
239-
descriptionSuccess: 'Beneficiary creation was successful',
239+
descriptionSuccess: 'Proceed recipient creation was successful',
240240
error: 'Error: ',
241-
descriptionFailed: 'Beneficiary creation failed',
241+
descriptionFailed: 'Proceed recipient creation failed',
242242
},
243243
},
244244
update: {
245-
title: 'Update Beneficiary',
246-
description: 'Fill in the form below to update a beneficiary',
245+
title: 'Update Proceed Recipient',
246+
description: 'Fill in the form below to update a proceed recipient',
247247
form: {
248248
address: {
249249
label: 'Address',
@@ -261,15 +261,15 @@ export default {
261261
},
262262
messages: {
263263
success: 'Success: ',
264-
descriptionSuccess: 'Beneficiary update was successful',
264+
descriptionSuccess: 'Proceed recipient update was successful',
265265
error: 'Error: ',
266-
descriptionFailed: 'Beneficiary update failed',
266+
descriptionFailed: 'Proceed recipient update failed',
267267
},
268268
},
269269
remove: {
270270
confirmPopUp: {
271-
title: 'Remove Beneficiary',
272-
description: 'Are you sure you want to remove this beneficiary?',
271+
title: 'Remove Proceed Recipient',
272+
description: 'Are you sure you want to remove this proceed recipient?',
273273
confirmText: 'Remove',
274274
cancelText: 'Cancel',
275275
},

0 commit comments

Comments
 (0)