Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(core): refactor activityDetails to use dApp components [LW-10281] #1085

Merged
merged 2 commits into from
May 21, 2024
Merged

refactor(core): refactor activityDetails to use dApp components [LW-10281] #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cfb48d
refactor(core): squash all commits to fix CI
tommayeliog May 21, 2024
dbca45f
Merge branch 'main' into refactor/LW-10281-dApp-connector-screens-act…
tommayeliog May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 16 additions & 24 deletions ...let/src/features/dapp/components/confirm-transaction/ConfirmDRepRegistrationContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ConfirmDRepRegistration } from '@lace/core';
import { certificateInspectorFactory, depositPaidWithSymbol, drepIDasBech32FromHash } from './utils';
import { ConfirmDRepRegistration, DappInfo } from '@lace/core';
import { certificateInspectorFactory, depositPaidWithSymbol } from './utils';
import { Wallet } from '@lace/cardano';
import { useWalletStore } from '@src/stores';
import { useViewsFlowContext } from '@providers';
import { Skeleton } from 'antd';
import { Box, Flex } from '@lace/ui';

const { CertificateType } = Wallet.Cardano;

export const ConfirmDRepRegistrationContainer = (): React.ReactElement => {
const { t } = useTranslation();
const {
walletUI: { cardanoCoin }
} = useWalletStore();
Expand All @@ -37,26 +36,19 @@ export const ConfirmDRepRegistrationContainer = (): React.ReactElement => {
}

const depositPaidWithCardanoSymbol = depositPaidWithSymbol(certificate.deposit, cardanoCoin);

// TODO: might be changed in scope of https://input-output.atlassian.net/browse/LW-9034
return (
<ConfirmDRepRegistration
dappInfo={dappInfo}
metadata={{
depositPaid: depositPaidWithCardanoSymbol,
drepId: drepIDasBech32FromHash(certificate.dRepCredential.hash),
hash: certificate.anchor?.dataHash,
url: certificate.anchor?.url
}}
translations={{
metadata: t('core.DRepRegistration.metadata'),
labels: {
depositPaid: t('core.DRepRegistration.depositPaid'),
drepId: t('core.DRepRegistration.drepId'),
hash: t('core.DRepRegistration.hash'),
url: t('core.DRepRegistration.url')
}
}}
/>
<Flex h="$fill" flexDirection="column">
<Box mb={'$24'} mt={'$24'}>
<DappInfo {...dappInfo} />
</Box>
<ConfirmDRepRegistration
metadata={{
depositPaid: depositPaidWithCardanoSymbol,
drepId: Wallet.util.drepIDasBech32FromHash(certificate.dRepCredential.hash),
hash: certificate.anchor?.dataHash,
url: certificate.anchor?.url
}}
/>
</Flex>
);
};
30 changes: 14 additions & 16 deletions ...allet/src/features/dapp/components/confirm-transaction/ConfirmDRepRetirementContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import React, { useCallback, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ConfirmDRepRetirement } from '@lace/core';
import { certificateInspectorFactory, depositPaidWithSymbol, disallowSignTx, drepIDasBech32FromHash } from './utils';
import { ConfirmDRepRetirement, DappInfo } from '@lace/core';
import { certificateInspectorFactory, depositPaidWithSymbol, disallowSignTx } from './utils';
import { Wallet } from '@lace/cardano';
import { useWalletStore } from '@src/stores';
import { useGetOwnPubDRepKeyHash } from './hooks';
import { Skeleton } from 'antd';
import { DappError } from '../DappError';
import { useViewsFlowContext } from '@providers';
import { Box, Flex } from '@lace/ui';

const { CertificateType } = Wallet.Cardano;

Expand Down Expand Up @@ -75,19 +76,16 @@ export const ConfirmDRepRetirementContainer = ({ onError }: Props): React.ReactE
}

return (
<ConfirmDRepRetirement
dappInfo={dappInfo}
metadata={{
depositReturned: depositPaidWithCardanoSymbol,
drepId: drepIDasBech32FromHash(certificate.dRepCredential.hash)
}}
translations={{
metadata: t('core.DRepRetirement.metadata'),
labels: {
depositReturned: t('core.DRepRetirement.depositReturned'),
drepId: t('core.DRepRetirement.drepId')
}
}}
/>
<Flex h="$fill" flexDirection="column">
<Box mb={'$24'} mt={'$24'}>
<DappInfo {...dappInfo} />
</Box>
<ConfirmDRepRetirement
metadata={{
depositReturned: depositPaidWithCardanoSymbol,
drepId: Wallet.util.drepIDasBech32FromHash(certificate.dRepCredential.hash)
}}
/>
</Flex>
);
};
35 changes: 15 additions & 20 deletions ...on-wallet/src/features/dapp/components/confirm-transaction/ConfirmDRepUpdateContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ConfirmDRepUpdate } from '@lace/core';
import { certificateInspectorFactory, drepIDasBech32FromHash } from './utils';
import { ConfirmDRepUpdate, DappInfo } from '@lace/core';
import { certificateInspectorFactory } from './utils';
import { Wallet } from '@lace/cardano';
import { useViewsFlowContext } from '@providers';
import { Skeleton } from 'antd';
import { Box, Flex } from '@lace/ui';

const { CertificateType } = Wallet.Cardano;

export const ConfirmDRepUpdateContainer = (): React.ReactElement => {
const { t } = useTranslation();
const {
signTxRequest: { request },
dappInfo
Expand All @@ -32,21 +31,17 @@ export const ConfirmDRepUpdateContainer = (): React.ReactElement => {
}

return (
<ConfirmDRepUpdate
dappInfo={dappInfo}
metadata={{
drepId: drepIDasBech32FromHash(certificate.dRepCredential.hash),
hash: certificate.anchor?.dataHash,
url: certificate.anchor?.url
}}
translations={{
metadata: t('core.DRepUpdate.metadata'),
labels: {
drepId: t('core.DRepUpdate.drepId'),
hash: t('core.DRepUpdate.hash'),
url: t('core.DRepUpdate.url')
}
}}
/>
<Flex h="$fill" flexDirection="column">
<Box mb={'$24'} mt={'$24'}>
<DappInfo {...dappInfo} />
</Box>
<ConfirmDRepUpdate
metadata={{
drepId: Wallet.util.drepIDasBech32FromHash(certificate.dRepCredential.hash),
hash: certificate.anchor?.dataHash,
url: certificate.anchor?.url
}}
/>
</Flex>
);
};
37 changes: 18 additions & 19 deletions ...tures/dapp/components/confirm-transaction/ConfirmStakeRegistrationDelegationContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ConfirmStakeRegistrationDelegation } from '@lace/core';
import { ConfirmStakeRegistrationDelegation, DappInfo } from '@lace/core';
import { certificateInspectorFactory, depositPaidWithSymbol } from './utils';
import { Wallet } from '@lace/cardano';
import { useWalletStore } from '@src/stores';
import { useViewsFlowContext } from '@providers';
import { Skeleton } from 'antd';
import { Box, Flex, TransactionSummary } from '@lace/ui';

const { CertificateType, RewardAddress } = Wallet.Cardano;

Expand Down Expand Up @@ -36,24 +37,22 @@ export const ConfirmStakeRegistrationDelegationContainer = (): React.ReactElemen
return <Skeleton loading />;
}
const depositPaidWithCardanoSymbol = depositPaidWithSymbol(certificate.deposit, cardanoCoin);

return (
<ConfirmStakeRegistrationDelegation
dappInfo={dappInfo}
metadata={{
poolId: certificate.poolId,
stakeKeyHash: RewardAddress.fromCredentials(currentChain.networkId, certificate.stakeCredential)
.toAddress()
.toBech32(),
depositPaid: depositPaidWithCardanoSymbol
}}
translations={{
metadata: t('core.StakeRegistrationDelegation.metadata'),
labels: {
poolId: t('core.StakeRegistrationDelegation.poolId'),
stakeKeyHash: t('core.StakeRegistrationDelegation.stakeKeyHash'),
depositPaid: t('core.StakeRegistrationDelegation.depositPaid')
}
}}
/>
<Flex h="$fill" flexDirection="column">
<Box mb={'$28'} mt={'$32'}>
<DappInfo {...dappInfo} />
</Box>
<TransactionSummary.Metadata label={t('core.StakeRegistrationDelegation.metadata')} text="" />
<ConfirmStakeRegistrationDelegation
metadata={{
poolId: certificate.poolId,
stakeKeyHash: RewardAddress.fromCredentials(currentChain.networkId, certificate.stakeCredential)
.toAddress()
.toBech32(),
depositPaid: depositPaidWithCardanoSymbol
}}
/>
</Flex>
);
};
46 changes: 19 additions & 27 deletions .../src/features/dapp/components/confirm-transaction/ConfirmStakeVoteDelegationContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ConfirmStakeVoteDelegation } from '@lace/core';
import { certificateInspectorFactory, drepIDasBech32FromHash } from './utils';
import { ConfirmStakeVoteDelegation, DappInfo } from '@lace/core';
import { certificateInspectorFactory } from './utils';
import { Wallet } from '@lace/cardano';
import { useWalletStore } from '@src/stores';
import { useViewsFlowContext } from '@providers';
import { Skeleton } from 'antd';
import { Box } from '@lace/ui';

const { CertificateType, RewardAddress } = Wallet.Cardano;

export const ConfirmStakeVoteDelegationContainer = (): React.ReactElement => {
const { t } = useTranslation();
const { currentChain } = useWalletStore();
const {
signTxRequest: { request },
Expand All @@ -36,28 +35,21 @@ export const ConfirmStakeVoteDelegationContainer = (): React.ReactElement => {
const dRep = certificate.dRep;

return (
<ConfirmStakeVoteDelegation
dappInfo={dappInfo}
metadata={{
poolId: certificate.poolId,
stakeKeyHash: RewardAddress.fromCredentials(currentChain.networkId, certificate.stakeCredential)
.toAddress()
.toBech32(),
alwaysAbstain: Wallet.Cardano.isDRepAlwaysAbstain(dRep),
alwaysNoConfidence: Wallet.Cardano.isDRepAlwaysNoConfidence(dRep),
...(Wallet.Cardano.isDRepCredential(dRep) ? { drepId: drepIDasBech32FromHash(dRep.hash) } : {})
}}
translations={{
metadata: t('core.StakeVoteDelegation.metadata'),
option: t('core.StakeVoteDelegation.option'),
labels: {
poolId: t('core.StakeVoteDelegation.poolId'),
stakeKeyHash: t('core.StakeVoteDelegation.stakeKeyHash'),
drepId: t('core.StakeVoteDelegation.drepId'),
alwaysAbstain: t('core.StakeVoteDelegation.alwaysAbstain'),
alwaysNoConfidence: t('core.StakeVoteDelegation.alwaysNoConfidence')
}
}}
/>
<>
<Box mb={'$28'} mt={'$32'}>
<DappInfo {...dappInfo} />
</Box>
<ConfirmStakeVoteDelegation
metadata={{
poolId: certificate.poolId,
stakeKeyHash: RewardAddress.fromCredentials(currentChain.networkId, certificate.stakeCredential)
.toAddress()
.toBech32(),
alwaysAbstain: Wallet.Cardano.isDRepAlwaysAbstain(dRep),
alwaysNoConfidence: Wallet.Cardano.isDRepAlwaysNoConfidence(dRep),
...(Wallet.Cardano.isDRepCredential(dRep) ? { drepId: Wallet.util.drepIDasBech32FromHash(dRep.hash) } : {})
}}
/>
</>
);
};
48 changes: 21 additions & 27 deletions ...s/dapp/components/confirm-transaction/ConfirmStakeVoteRegistrationDelegationContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ConfirmStakeVoteRegistrationDelegation } from '@lace/core';
import { certificateInspectorFactory, depositPaidWithSymbol, drepIDasBech32FromHash } from './utils';
import { ConfirmStakeVoteRegistrationDelegation, DappInfo } from '@lace/core';
import { certificateInspectorFactory, depositPaidWithSymbol } from './utils';
import { Wallet } from '@lace/cardano';
import { useWalletStore } from '@src/stores';
import { useViewsFlowContext } from '@providers';
import { Skeleton } from 'antd';
import { Box, Flex, TransactionSummary } from '@lace/ui';

const { CertificateType, RewardAddress } = Wallet.Cardano;

Expand Down Expand Up @@ -41,30 +42,23 @@ export const ConfirmStakeVoteRegistrationDelegationContainer = (): React.ReactEl
const depositPaidWithCardanoSymbol = depositPaidWithSymbol(certificate.deposit, cardanoCoin);

return (
<ConfirmStakeVoteRegistrationDelegation
dappInfo={dappInfo}
metadata={{
poolId: certificate.poolId,
stakeKeyHash: RewardAddress.fromCredentials(currentChain.networkId, certificate.stakeCredential)
.toAddress()
.toBech32(),
depositPaid: depositPaidWithCardanoSymbol,
alwaysAbstain: Wallet.Cardano.isDRepAlwaysAbstain(dRep),
alwaysNoConfidence: Wallet.Cardano.isDRepAlwaysNoConfidence(dRep),
...(Wallet.Cardano.isDRepCredential(dRep) ? { drepId: drepIDasBech32FromHash(dRep.hash) } : {})
}}
translations={{
metadata: t('core.StakeVoteDelegationRegistration.metadata'),
option: t('core.StakeVoteDelegationRegistration.option'),
labels: {
poolId: t('core.StakeVoteDelegationRegistration.poolId'),
stakeKeyHash: t('core.StakeVoteDelegationRegistration.stakeKeyHash'),
drepId: t('core.StakeVoteDelegationRegistration.drepId'),
alwaysAbstain: t('core.StakeVoteDelegationRegistration.alwaysAbstain'),
alwaysNoConfidence: t('core.StakeVoteDelegationRegistration.alwaysNoConfidence'),
depositPaid: t('core.StakeVoteDelegationRegistration.depositPaid')
}
}}
/>
<Flex h="$fill" flexDirection="column">
<Box mb={'$28'} mt={'$32'}>
<DappInfo {...dappInfo} />
</Box>
<TransactionSummary.Metadata label={t('core.StakeVoteDelegationRegistration.metadata')} text="" />
przemyslaw-wlodek marked this conversation as resolved.
Show resolved Hide resolved
<ConfirmStakeVoteRegistrationDelegation
metadata={{
poolId: certificate.poolId,
stakeKeyHash: RewardAddress.fromCredentials(currentChain.networkId, certificate.stakeCredential)
.toAddress()
.toBech32(),
depositPaid: depositPaidWithCardanoSymbol,
alwaysAbstain: Wallet.Cardano.isDRepAlwaysAbstain(dRep),
alwaysNoConfidence: Wallet.Cardano.isDRepAlwaysNoConfidence(dRep),
...(Wallet.Cardano.isDRepCredential(dRep) ? { drepId: Wallet.util.drepIDasBech32FromHash(dRep.hash) } : {})
}}
/>
</Flex>
);
};
Loading
Loading