Merge branch 'release/7.0.0' into fix/LW-11924-links-styling

input-output-hk · Dec 3, 2024 · 0265c84 · 0265c84
2 parents 832e3c2 + 8074836
commit 0265c84
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/source/renderer/app/components/voting/VotingUnavailable.scss b/source/renderer/app/components/voting/VotingUnavailable.scss
@@ -7,8 +7,6 @@
   flex: 1;
   flex-direction: column;
   justify-content: center;
-  margin-bottom: -40px;
-  padding: 20px;
   text-align: center;
 
   h1 {

diff --git a/source/renderer/app/components/voting/voting-governance/VotingPowerDelegation.tsx b/source/renderer/app/components/voting/voting-governance/VotingPowerDelegation.tsx
@@ -218,6 +218,7 @@ function VotingPowerDelegation({
             placeholder={intl.formatMessage(messages.selectWalletPlaceholder)}
             value={state.selectedWallet?.id || null}
             getStakePoolById={getStakePoolById}
+            disableSyncingWallets
           />
 
           {state.selectedWallet && (

diff --git a/source/renderer/app/components/widgets/forms/WalletsDropdown.tsx b/source/renderer/app/components/widgets/forms/WalletsDropdown.tsx
@@ -27,6 +27,7 @@ type Props = {
   value?: string;
   errorPosition?: string;
   disabled?: boolean;
+  disableSyncingWallets?: boolean;
   wallets?: Array<Partial<Wallet>>;
 };
 export const onSearchWalletsDropdown = (
@@ -46,6 +47,7 @@ function WalletsDropdown({
   numberOfStakePools,
   onSearch = onSearchWalletsDropdown,
   wallets = [],
+  disableSyncingWallets,
   ...props
 }: Props) {
   const discreetModeFeature = useDiscreetModeFeature();
@@ -81,6 +83,7 @@ function WalletsDropdown({
       walletName: wallet.name,
       isSyncing,
       syncingProgress,
+      isDisabled: disableSyncingWallets ? isSyncing : false,
     };
   });
   return (

diff --git a/source/renderer/app/containers/voting/VotingGovernancePage.tsx b/source/renderer/app/containers/voting/VotingGovernancePage.tsx
@@ -4,6 +4,7 @@ import type { InjectedProps } from '../../types/injectedPropsType';
 import VotingPowerDelegation from '../../components/voting/voting-governance/VotingPowerDelegation';
 import VotingPowerDelegationConfirmationDialog from '../../components/voting/voting-governance/VotingPowerDelegationConfirmationDialog';
 import { ROUTES } from '../../routes-config';
+import VotingUnavailable from '../../components/voting/VotingUnavailable';
 
 type Props = InjectedProps;
 
@@ -22,8 +23,21 @@ class VotingGovernancePage extends Component<Props> {
       app,
       voting,
       hardwareWallets,
+      networkStatus,
     } = this.props.stores;
     const { openExternalLink } = app;
+    const { isSynced, syncPercentage } = networkStatus;
+
+    if (!isSynced) {
+      return (
+        <VotingUnavailable
+          syncPercentage={syncPercentage}
+          // @ts-ignore ts-migrate(2322) FIXME: Type '{ syncPercentage: any; onExternalLinkClick: ... Remove this comment to see the full error message
+          onExternalLinkClick={openExternalLink}
+        />
+      );
+    }
+
     return (
       <VotingPowerDelegation
         onExternalLinkClick={openExternalLink}

diff --git a/source/renderer/app/utils/transactionsCsvGenerator.ts b/source/renderer/app/utils/transactionsCsvGenerator.ts
@@ -187,7 +187,9 @@ const transactionsCsvGenerator = async ({
 
       const valueTokens = filterAssets(assets, type, isInternalAddress)
         .map(({ policyId, assetName, quantity }) => {
-          const { fingerprint, metadata } = getAsset(policyId, assetName);
+          const assetData = getAsset(policyId, assetName);
+          const fingerprint = assetData?.fingerprint || 'unknown fingerprint';
+          const metadata = assetData?.metadata || {};
           const formattedAmount = formattedTokenWalletAmount(
             quantity,
             metadata,