Merge remote-tracking branch 'origin/production' into release/5.4.500

Emurgo · Nov 21, 2024 · 16dc6e6 · 16dc6e6
2 parents 9a48074 + db37ee7
commit 16dc6e6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/packages/yoroi-extension/app/containers/wallet/WalletSendPage.js b/packages/yoroi-extension/app/containers/wallet/WalletSendPage.js
@@ -32,6 +32,9 @@ import AddNFTDialog from '../../components/wallet/send/WalletSendFormSteps/AddNF
 import AddTokenDialog from '../../components/wallet/send/WalletSendFormSteps/AddTokenDialog';
 import { ampli } from '../../../ampli/index';
 import { getNetworkById } from '../../api/ada/lib/storage/database/prepackaged/networks';
+import LoadingSpinner from '../../components/widgets/LoadingSpinner';
+import VerticallyCenteredLayout from '../../components/layout/VerticallyCenteredLayout';
+import FullscreenLayout from '../../components/layout/FullscreenLayout';
 
 const messages = defineMessages({
   txConfirmationLedgerNanoLine1: {
@@ -145,7 +148,13 @@ class WalletSendPage extends Component<AllProps> {
     } = this.props.stores;
 
     if (!protocolParameters.loadProtocolParametersRequest.wasExecuted) {
-      return null;
+      return (
+        <FullscreenLayout bottomPadding={0}>
+          <VerticallyCenteredLayout>
+            <LoadingSpinner />
+          </VerticallyCenteredLayout>
+        </FullscreenLayout>
+      );
     }
 
     const { actions } = this.props;

diff --git a/packages/yoroi-extension/app/stores/toplevel/ProtocolParametersStore.js b/packages/yoroi-extension/app/stores/toplevel/ProtocolParametersStore.js
@@ -20,6 +20,7 @@ export default class ProtocolParametersStore<
   async loadProtocolParameters(): Promise<void> {
     for (const key of Object.keys(networks)) {
       const networkId = networks[key].NetworkId;
+      if (networkId === networks.CardanoSanchoTestnet.NetworkId) continue;
       const protocolParameters = await getProtocolParameters({ networkId });
       this.cache.set(networkId, protocolParameters);
     }

diff --git a/packages/yoroi-extension/package-lock.json b/packages/yoroi-extension/package-lock.json
diff --git a/packages/yoroi-extension/package.json b/packages/yoroi-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yoroi",
-  "version": "5.4.400",
+  "version": "5.4.410",
   "description": "Cardano ADA wallet",
   "scripts": {
     "dev-mv2": "rimraf dev/ && NODE_OPTIONS=--openssl-legacy-provider babel-node scripts-mv2/build --type=debug --env 'mainnet'",