Merge pull request #3346 from energywebfoundation/chore/naming-and-typos

packages/ui/apps/origin-ui-e2e/src/integration/organization/organization_active_flow.spec.ts

@@ -70,24 +70,24 @@ describe('Organization with status Active and User status active flow', () => {
     cy.contains('Sell offers');
     cy.contains('Buy offers');
 
-    cy.navigateMenu('exchangeAllBundles');
-    cy.url().should('include', 'all-bundles');
+    cy.navigateMenu('exchangeAllPackages');
+    cy.url().should('include', 'all-packages');
     cy.contains('Total energy');
     cy.contains('Price per MWh');
 
-    cy.navigateMenu('exchangeCreateBundle');
-    cy.url().should('include', 'create-bundle');
-    cy.contains('Create Bundle');
+    cy.navigateMenu('exchangeCreatePackage');
+    cy.url().should('include', 'create-package');
+    cy.contains('Create Package');
     cy.contains('Selected For Sale');
 
     cy.navigateMenu('exchangeMyTrades');
     cy.url().should('include', 'my-trades');
     cy.contains('My Trades');
     cy.contains('Total');
 
-    cy.navigateMenu('exchangeMyBundles');
-    cy.url().should('include', 'my-bundles');
-    cy.contains('My bundles');
+    cy.navigateMenu('exchangeMyPackages');
+    cy.url().should('include', 'my-packages');
+    cy.contains('My packages');
     cy.contains('Total energy');
 
     cy.navigateMenu('exchangeMyOrders');

packages/ui/apps/origin-ui-e2e/src/integration/organization/organization_pending_flow.spec.ts

@@ -120,13 +120,13 @@ describe('Organization with status Pending and User status active flow', () => {
     cy.contains('Sell offers');
     cy.contains('Buy offers');
 
-    cy.navigateMenu('exchangeAllBundles');
-    cy.url().should('include', 'all-bundles');
+    cy.navigateMenu('exchangeAllPackages');
+    cy.url().should('include', 'all-packages');
     cy.contains('Total energy');
     cy.contains('Price per MWh');
 
-    cy.navigateMenu('exchangeCreateBundle');
-    cy.url().should('include', 'create-bundle');
+    cy.navigateMenu('exchangeCreatePackage');
+    cy.url().should('include', 'create-package');
     cy.contains('fulfill following criteria');
     cy.contains('exchange deposit address');
 
@@ -135,8 +135,8 @@ describe('Organization with status Pending and User status active flow', () => {
     cy.contains('fulfill following criteria');
     cy.contains('exchange deposit address');
 
-    cy.navigateMenu('exchangeMyBundles');
-    cy.url().should('include', 'my-bundles');
+    cy.navigateMenu('exchangeMyPackages');
+    cy.url().should('include', 'my-packages');
     cy.contains('fulfill following criteria');
     cy.contains('exchange deposit address');
 

packages/ui/apps/origin-ui-e2e/src/integration/user/inactive_user_flow.spec.ts

@@ -48,10 +48,10 @@ describe('User with status Pending flow', () => {
 
     cy.dataCy('exchangeMenu');
     cy.dataCy('exchangeViewMarket');
-    cy.dataCy('exchangeAllBundles');
+    cy.dataCy('exchangeAllPackages');
 
-    cy.dataCy('exchangeCreateBundle').should('not.exist');
-    cy.dataCy('exchangeMyBundles').should('not.exist');
+    cy.dataCy('exchangeCreatePackage').should('not.exist');
+    cy.dataCy('exchangeMyPackages').should('not.exist');
     cy.dataCy('exchangeMyTrades').should('not.exist');
     cy.dataCy('exchangeMyOrders').should('not.exist');
     cy.dataCy('exchangeSupply').should('not.exist');

packages/ui/libs/certificate/data/src/handlers/retireCertificate.ts → packages/ui/libs/certificate/data/src/handlers/blockchainRedeemCertificate.ts

@@ -16,7 +16,7 @@ import { useTranslation } from 'react-i18next';
 import { useQueryClient } from 'react-query';
 import { useGetBlockchainCertificateHandler } from '../fetching';
 
-export const useRetireCertificateHandler = (
+export const useBlockchainRedeemCertificateHandler = (
   selectedBeneficiary: BeneficiaryDTO,
   resetList: () => void,
   startDate: Dayjs,
@@ -32,7 +32,7 @@ export const useRetireCertificateHandler = (
   const { getBlockchainCertificate, isLoading: isGetBlockchainLoading } =
     useGetBlockchainCertificateHandler();
 
-  const retireHandler = async <Id>(id: Id, amount: string) => {
+  const redeemHandler = async <Id>(id: Id, amount: string) => {
     try {
       const onChainCertificate = await getBlockchainCertificate(
         id as unknown as CertificateDTO['id']
@@ -59,7 +59,7 @@ export const useRetireCertificateHandler = (
       } else {
         setTxPending(false);
         showNotification(
-          t('certificate.blockchainInbox.notifications.retireSuccess'),
+          t('certificate.blockchainInbox.notifications.redeemSuccess'),
           NotificationTypeEnum.Success
         );
         queryClient.resetQueries(blockchainCertificatesQueryKey);
@@ -68,13 +68,13 @@ export const useRetireCertificateHandler = (
     } catch (error) {
       console.error(error);
       showNotification(
-        t('certificate.blockchainInbox.notifications.retireError'),
+        t('certificate.blockchainInbox.notifications.redeemError'),
         NotificationTypeEnum.Error
       );
     }
   };
 
   const isLoading = isGetBlockchainLoading;
 
-  return { retireHandler, isLoading };
+  return { redeemHandler, isLoading };
 };

packages/ui/libs/certificate/data/src/handlers/claimCertificate.ts → packages/ui/libs/certificate/data/src/handlers/exchangeRedeemCertificate.ts

@@ -1,8 +1,6 @@
 import {
   AccountAssetDTO,
-  ClaimDataDTO,
   getAccountBalanceControllerGetQueryKey,
-  RequestClaimDTO,
 } from '@energyweb/exchange-react-query-client';
 import {
   useIrecTransferControllerRequestClaim,
@@ -20,7 +18,7 @@ import { useTranslation } from 'react-i18next';
 import { useQueryClient } from 'react-query';
 import { useCachedUser } from '../cached';
 
-export const useClaimCertificateHandler = (
+export const useExchangeRedeemCertificateHandler = (
   exchangeCertificates: AccountAssetDTO[],
   beneficiary: BeneficiaryDTO,
   startDate: Dayjs,
@@ -36,7 +34,7 @@ export const useClaimCertificateHandler = (
 
   const user = useCachedUser();
 
-  const claimHandler = <Id>(id: Id, amount: string) => {
+  const redeemHandler = <Id>(id: Id, amount: string) => {
     setTxPending(true);
     const assetId = exchangeCertificates.find(
       (cert) =>
@@ -65,15 +63,15 @@ export const useClaimCertificateHandler = (
       {
         onSuccess: () => {
           showNotification(
-            t('certificate.exchangeInbox.notifications.claimSuccess'),
+            t('certificate.exchangeInbox.notifications.redeemSuccess'),
             NotificationTypeEnum.Success
           );
           queryClient.invalidateQueries(exchangeCertificatesQueryKey);
           resetList();
         },
         onError: (error: any) => {
           showNotification(
-            `${t('certificate.exchangeInbox.notifications.claimError')}:
+            `${t('certificate.exchangeInbox.notifications.redeemError')}:
             ${error?.response?.data?.message || ''}
             `,
             NotificationTypeEnum.Error
@@ -84,5 +82,5 @@ export const useClaimCertificateHandler = (
     );
   };
 
-  return { claimHandler, isMutating: isLoading };
+  return { redeemHandler, isMutating: isLoading };
 };

packages/ui/libs/certificate/data/src/handlers/index.ts

@@ -5,9 +5,9 @@ export * from './sellCertificate';
 export * from './withdrawCertificate';
 export * from './exchangeTransferCertificate';
 export * from './exchangeExportCertificate';
-export * from './claimCertificate';
+export * from './exchangeRedeemCertificate';
 
 export * from './depositCertificate';
-export * from './retireCertificate';
+export * from './blockchainRedeemCertificate';
 export * from './blockchainTransferCertificate';
 export * from './importCertificate';

packages/ui/libs/certificate/logic/src/blockchain-inbox/retireAction.ts → packages/ui/libs/certificate/logic/src/blockchain-inbox/blockchainRedeemAction.ts

@@ -6,10 +6,10 @@ import { formatSelectedBlockchainItems } from './formatSelectedBlockchain';
 import {
   SelectedItem,
   TUseBeneficiaryFormLogic,
-  TUseRetireActionLogic,
+  TUseBlockchainRedeemActionLogic,
 } from './types';
 
-export const useRetireActionLogic: TUseRetireActionLogic<
+export const useBlockchainRedeemActionLogic: TUseBlockchainRedeemActionLogic<
   CertificateDTO['id']
 > = ({ selectedIds, blockchainCertificates, allDevices, allFuelTypes }) => {
   const { t } = useTranslation();
@@ -24,8 +24,8 @@ export const useRetireActionLogic: TUseRetireActionLogic<
     : [];
 
   return {
-    title: t('certificate.blockchainInbox.selectedForRetirement'),
-    buttonText: t('certificate.blockchainInbox.retireButton'),
+    title: t('certificate.blockchainInbox.selectedForRedemption'),
+    buttonText: t('certificate.blockchainInbox.redeemButton'),
     selectedItems,
     selectDisabledTooltip: t(
       'certificate.blockchainInbox.addBeneficiariesTooltip'

packages/ui/libs/certificate/logic/src/blockchain-inbox/index.ts

@@ -1,6 +1,6 @@
 export * from './blockchainInbox';
 export * from './depositAction';
-export * from './retireAction';
+export * from './blockchainRedeemAction';
 export * from './blockchainTransferAction';
 export * from './permissions';
 export * from './types';

packages/ui/libs/certificate/logic/src/blockchain-inbox/types.ts

@@ -69,15 +69,15 @@ export type TUseDepositActionLogic<Id> = (
   selectedItems: SelectedItem<Id>[];
 };
 
-type TUseRetireActionLogicArgs<Id> = {
+type TUseBlockchainRedeemActionLogicArgs<Id> = {
   selectedIds: Id[];
   blockchainCertificates: CertificateDTO[];
   allDevices: ComposedPublicDevice[];
   allFuelTypes: CodeNameDTO[];
 };
 
-export type TUseRetireActionLogic<Id> = (
-  args: TUseRetireActionLogicArgs<Id>
+export type TUseBlockchainRedeemActionLogic<Id> = (
+  args: TUseBlockchainRedeemActionLogicArgs<Id>
 ) => {
   title: string;
   buttonText: string;

packages/ui/libs/certificate/logic/src/exchange-inbox/claimAction.ts → packages/ui/libs/certificate/logic/src/exchange-inbox/exchangeRedeemAction.ts

@@ -5,11 +5,11 @@ import * as yup from 'yup';
 import { formatSelectedExchangeItems } from './formatSelectedExchangeItems';
 import {
   SelectedItem,
-  TUseClaimActionLogic,
-  TUseClaimBeneficiariesFormLogic,
+  TUseExchangeRedeemActionLogic,
+  TUseRedeemBeneficiariesFormLogic,
 } from './types';
 
-export const useClaimActionLogic: TUseClaimActionLogic<
+export const useExchangeRedeemActionLogic: TUseExchangeRedeemActionLogic<
   AccountAssetDTO['asset']['id']
 > = ({ selectedIds, exchangeCertificates, allDevices, allFuelTypes }) => {
   const { t } = useTranslation();
@@ -25,16 +25,16 @@ export const useClaimActionLogic: TUseClaimActionLogic<
       : [];
 
   return {
-    title: t('certificate.exchangeInbox.selectedForClaim'),
-    buttonText: t('certificate.exchangeInbox.claimButton'),
+    title: t('certificate.exchangeInbox.selectedForRedemption'),
+    buttonText: t('certificate.exchangeInbox.redeemButton'),
     selectedItems,
     selectDisabledTooltip: t(
       'certificate.exchangeInbox.addBeneficiariesTooltip'
     ),
   };
 };
 
-export const useClaimBeneficiaryFormLogic: TUseClaimBeneficiariesFormLogic = (
+export const useRedeemBeneficiaryFormLogic: TUseRedeemBeneficiariesFormLogic = (
   beneficiaries
 ) => {
   const { t } = useTranslation();

packages/ui/libs/certificate/logic/src/exchange-inbox/index.ts

@@ -3,4 +3,4 @@ export * from './sellAction';
 export * from './withdrawAction';
 export * from './exchangeTransferAction';
 export * from './exchangeExportAction';
-export * from './claimAction';
+export * from './exchangeRedeemAction';

packages/ui/libs/certificate/logic/src/exchange-inbox/types.ts

@@ -128,30 +128,32 @@ export type TUseExchangeExportActionLogic<Id> = (
   inputHeader: string;
 };
 
-type TUseClaimActionLogicArgs<Id> = {
+type TUseExchangeRedeemActionLogicArgs<Id> = {
   selectedIds: Id[];
   exchangeCertificates: AccountAssetDTO[];
   allDevices: ComposedPublicDevice[];
   allFuelTypes: CodeNameDTO[];
 };
 
-export type TUseClaimActionLogic<Id> = (args: TUseClaimActionLogicArgs<Id>) => {
+export type TUseExchangeRedeemActionLogic<Id> = (
+  args: TUseExchangeRedeemActionLogicArgs<Id>
+) => {
   title: string;
   buttonText: string;
   selectedItems: SelectedItem<Id>[];
   selectDisabledTooltip: string;
 };
 
-export type ClaimBeneficiaryFormValues = {
+export type RedeemBeneficiaryFormValues = {
   beneficiary: number;
   startDate: Dayjs;
   endDate: Dayjs;
   purpose: string;
 };
 
-export type TUseClaimBeneficiariesFormLogic = (
+export type TUseRedeemBeneficiariesFormLogic = (
   beneficiaries: BeneficiaryDTO[]
 ) => Pick<
-  GenericFormProps<ClaimBeneficiaryFormValues>,
+  GenericFormProps<RedeemBeneficiaryFormValues>,
   'initialValues' | 'validationSchema' | 'fields'
 >;

packages/ui/libs/certificate/view/src/containers/action/RetireAction/RetireAction.effects.ts → packages/ui/libs/certificate/view/src/containers/action/BlockchainRedeemAction/BlockchainRedeemAction.effects.ts

@@ -2,12 +2,12 @@ import {
   useCachedBlockchainCertificates,
   useCachedAllFuelTypes,
   useCachedAllDevices,
-  useRetireCertificateHandler,
+  useBlockchainRedeemCertificateHandler,
   useCompanyBeneficiaries,
 } from '@energyweb/origin-ui-certificate-data';
 import {
   useBeneficiaryFormLogic,
-  useRetireActionLogic,
+  useBlockchainRedeemActionLogic,
 } from '@energyweb/origin-ui-certificate-logic';
 import { Dayjs } from 'dayjs';
 import { useMemo } from 'react';
@@ -16,7 +16,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { CertificateDTO } from '@energyweb/issuer-irec-api-react-query-client';
 import { useTransactionPendingDispatch } from '../../../context';
 
-export const useRetireActionEffects = (
+export const useBlockchainRedeemActionEffects = (
   selectedIds: CertificateDTO['id'][],
   resetIds: () => void
 ) => {
@@ -46,8 +46,8 @@ export const useRetireActionEffects = (
     [companyBeneficiaries, beneficiary]
   );
 
-  const { retireHandler, isLoading: isHandlerLoading } =
-    useRetireCertificateHandler(
+  const { redeemHandler, isLoading: isHandlerLoading } =
+    useBlockchainRedeemCertificateHandler(
       selectedBeneficiary,
       resetIds,
       startDate as Dayjs,
@@ -56,7 +56,7 @@ export const useRetireActionEffects = (
       setTxPending
     );
 
-  const actionLogic = useRetireActionLogic({
+  const actionLogic = useBlockchainRedeemActionLogic({
     selectedIds,
     blockchainCertificates,
     allDevices,
@@ -70,7 +70,7 @@ export const useRetireActionEffects = (
 
   return {
     ...actionLogic,
-    retireHandler,
+    redeemHandler,
     isLoading,
     buttonDisabled,
     fields,