Update Staking UI (hacky)

nimiq · Nov 21, 2024 · 52a2bc3 · 52a2bc3
1 parent 251448c
commit 52a2bc3
Show file tree

Hide file tree

Showing 12 changed files with 164 additions and 118 deletions.
diff --git a/src/components/staking/StakingGraphPage.vue b/src/components/staking/StakingGraphPage.vue
@@ -148,6 +148,12 @@ export default defineComponent({
                         );
                         const txs = await sendStaking({
                             transaction: transaction.serialize(),
+                            recipientLabel: 'name' in activeValidator.value! ? activeValidator.value.name : 'Validator',
+                            // @ts-expect-error Not typed yet in Hub
+                            validatorImageUrl: 'logo' in activeValidator.value!
+                                && !activeValidator.value.hasDefaultIcon
+                                ? activeValidator.value.logo
+                                : undefined,
                         }).catch((error) => {
                             throw new Error(error.data);
                         });
@@ -185,6 +191,13 @@ export default defineComponent({
                         );
                         const txs = await sendStaking({
                             transaction: transaction.serialize(),
+                            recipientLabel: 'name' in activeValidator.value! ? activeValidator.value.name : 'Validator',
+                            // @ts-expect-error Not typed yet in Hub
+                            validatorAddress: activeValidator.value!.address,
+                            validatorImageUrl: ('logo' in activeValidator.value!
+                                && !activeValidator.value.hasDefaultIcon)
+                                ? activeValidator.value.logo
+                                : undefined,
                         }).catch((error) => {
                             throw new Error(error.data);
                         });
@@ -227,6 +240,13 @@ export default defineComponent({
                     );
                     const txs = await sendStaking({
                         transaction: transaction.serialize(),
+                        recipientLabel: 'name' in activeValidator.value! ? activeValidator.value.name : 'Validator',
+                        // @ts-expect-error Not typed yet in Hub
+                        validatorAddress: activeValidator.value!.address,
+                        validatorImageUrl: 'logo' in activeValidator.value! && !activeValidator.value.hasDefaultIcon
+                            ? activeValidator.value.logo
+                            : undefined,
+                        amount: Math.abs(stakeDelta.value),
                     }).catch((error) => {
                         throw new Error(error.data);
                     });

diff --git a/src/components/staking/StakingInfoPage.vue b/src/components/staking/StakingInfoPage.vue
@@ -151,6 +151,7 @@
             >
                 <a href="#" slot="unstakeEverythingLink" @click="deactivateAll">{{ $t('unstake everything') }}</a>
             </i18n>
+            <div v-else class="switch-validator"></div>
 
             <!-- <button class="nq-button-s rewards-history" @click="$emit('next')">
                 {{ $t('Rewards history') }} &gt;
@@ -273,6 +274,13 @@ export default defineComponent({
 
                     const txs = await sendStaking({
                         transaction: transaction.serialize(),
+                        recipientLabel: 'name' in validator.value! ? validator.value.name : 'Validator',
+                        // @ts-expect-error Not typed yet in Hub
+                        validatorAddress: validator.value!.address,
+                        validatorImageUrl: 'logo' in validator.value! && !validator.value.hasDefaultIcon
+                            ? validator.value.logo
+                            : undefined,
+                        amount: Math.abs(stake.value.activeBalance),
                     });
 
                     if (!txs) {
@@ -352,6 +360,12 @@ export default defineComponent({
 
                 const txs = await sendStaking({
                     transaction: transactions.map((tx) => tx.serialize()),
+                    recipientLabel: 'name' in validator.value! ? validator.value.name : 'Validator',
+                    // @ts-expect-error Not typed yet in Hub
+                    validatorAddress: validator.value!.address,
+                    validatorImageUrl: 'logo' in validator.value! && !validator.value.hasDefaultIcon
+                        ? validator.value.logo
+                        : undefined,
                 });
 
                 if (!txs) {

diff --git a/src/components/staking/ValidatorDetailsOverlay.vue b/src/components/staking/ValidatorDetailsOverlay.vue
@@ -86,7 +86,7 @@ export default defineComponent({
     },
     setup(props, context) {
         const { activeAddress } = useAddressStore();
-        const { activeStake, setStake } = useStakingStore();
+        const { activeStake, setStake, activeValidator } = useStakingStore();
 
         async function selectValidator() {
             const validatorLabelOrAddress = 'name' in props.validator
@@ -125,6 +125,18 @@ export default defineComponent({
 
                     const txs = await sendStaking({
                         transaction: transaction.serialize(),
+                        senderLabel: 'name' in activeValidator.value! ? activeValidator.value.name : 'Validator',
+                        recipientLabel: 'name' in props.validator ? props.validator.name : 'Validator',
+                        // @ts-expect-error Not typed yet in Hub
+                        validatorAddress: props.validator.address,
+                        validatorImageUrl: 'logo' in props.validator && !props.validator.hasDefaultIcon
+                            ? props.validator.logo
+                            : undefined,
+                        fromValidatorAddress: activeValidator.value!.address,
+                        fromValidatorImageUrl: 'logo' in activeValidator.value! && !activeValidator.value.hasDefaultIcon
+                            ? activeValidator.value.logo
+                            : undefined,
+                        amount: activeStake.value.inactiveBalance,
                     }).catch((error) => {
                         throw new Error(error.data);
                     });

diff --git a/src/i18n/de.po b/src/i18n/de.po
@@ -956,7 +956,7 @@ msgstr "Krypto-Swaps werden derzeit gewartet."
 msgid "Deactivate validator"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:257
+#: src/components/staking/StakingInfoPage.vue:258
 msgid "Deactivating Stake"
 msgstr ""
 
@@ -2433,7 +2433,7 @@ msgid "Send, receive and hold BTC in your wallet."
 msgstr "Sende, empfange und verwahre BTC in deiner Wallet."
 
 #: src/components/staking/StakingGraphPage.vue:136
-#: src/components/staking/StakingGraphPage.vue:218
+#: src/components/staking/StakingGraphPage.vue:231
 msgid "Sending Staking Transaction"
 msgstr ""
 
@@ -2443,7 +2443,7 @@ msgstr ""
 msgid "Sending Transaction"
 msgstr "Transaktion wird versendet"
 
-#: src/components/staking/StakingInfoPage.vue:320
+#: src/components/staking/StakingInfoPage.vue:328
 msgid "Sending Unstaking Transaction"
 msgstr ""
 
@@ -2587,10 +2587,10 @@ msgstr "Überspringen"
 #: src/components/modals/SendModal.vue:636
 #: src/components/modals/SendModal.vue:821
 #: src/components/modals/StablecoinSendModal.vue:677
-#: src/components/staking/StakingGraphPage.vue:272
-#: src/components/staking/StakingInfoPage.vue:307
-#: src/components/staking/StakingInfoPage.vue:384
-#: src/components/staking/ValidatorDetailsOverlay.vue:161
+#: src/components/staking/StakingGraphPage.vue:292
+#: src/components/staking/StakingInfoPage.vue:315
+#: src/components/staking/StakingInfoPage.vue:398
+#: src/components/staking/ValidatorDetailsOverlay.vue:173
 msgid "Something went wrong"
 msgstr "Etwas ging schief"
 
@@ -2660,27 +2660,27 @@ msgstr ""
 msgid "Store of value, got it"
 msgstr "Wertaufbewahrung, verstanden"
 
-#: src/components/staking/StakingGraphPage.vue:205
+#: src/components/staking/StakingGraphPage.vue:218
 msgid "Successfully added {amount} NIM to your stake with {validator}"
 msgstr ""
 
-#: src/components/staking/ValidatorDetailsOverlay.vue:145
+#: src/components/staking/ValidatorDetailsOverlay.vue:157
 msgid "Successfully changed validator to {validator}"
 msgstr "Validator erfolgreich geändert zu {validator}"
 
-#: src/components/staking/StakingInfoPage.vue:291
+#: src/components/staking/StakingInfoPage.vue:299
 msgid "Successfully deactivated {amount} NIM"
 msgstr ""
 
-#: src/components/staking/StakingGraphPage.vue:247
+#: src/components/staking/StakingGraphPage.vue:267
 msgid "Successfully deactivated {amount} NIM from your stake with {validator}"
 msgstr ""
 
-#: src/components/staking/StakingGraphPage.vue:168
+#: src/components/staking/StakingGraphPage.vue:174
 msgid "Successfully staked {amount} NIM with {validator}"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:370
+#: src/components/staking/StakingInfoPage.vue:384
 msgid "Successfully unstaked {amount} NIM"
 msgstr ""
 

diff --git a/src/i18n/en.po b/src/i18n/en.po
@@ -881,7 +881,7 @@ msgstr ""
 msgid "Deactivate validator"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:257
+#: src/components/staking/StakingInfoPage.vue:258
 msgid "Deactivating Stake"
 msgstr ""
 
@@ -2226,7 +2226,7 @@ msgid "Send, receive and hold BTC in your wallet."
 msgstr ""
 
 #: src/components/staking/StakingGraphPage.vue:136
-#: src/components/staking/StakingGraphPage.vue:218
+#: src/components/staking/StakingGraphPage.vue:231
 msgid "Sending Staking Transaction"
 msgstr ""
 
@@ -2236,7 +2236,7 @@ msgstr ""
 msgid "Sending Transaction"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:320
+#: src/components/staking/StakingInfoPage.vue:328
 msgid "Sending Unstaking Transaction"
 msgstr ""
 
@@ -2379,10 +2379,10 @@ msgstr ""
 #: src/components/modals/SendModal.vue:636
 #: src/components/modals/SendModal.vue:821
 #: src/components/modals/StablecoinSendModal.vue:677
-#: src/components/staking/StakingGraphPage.vue:272
-#: src/components/staking/StakingInfoPage.vue:307
-#: src/components/staking/StakingInfoPage.vue:384
-#: src/components/staking/ValidatorDetailsOverlay.vue:161
+#: src/components/staking/StakingGraphPage.vue:292
+#: src/components/staking/StakingInfoPage.vue:315
+#: src/components/staking/StakingInfoPage.vue:398
+#: src/components/staking/ValidatorDetailsOverlay.vue:173
 msgid "Something went wrong"
 msgstr ""
 
@@ -2452,27 +2452,27 @@ msgstr ""
 msgid "Store of value, got it"
 msgstr ""
 
-#: src/components/staking/StakingGraphPage.vue:205
+#: src/components/staking/StakingGraphPage.vue:218
 msgid "Successfully added {amount} NIM to your stake with {validator}"
 msgstr ""
 
-#: src/components/staking/ValidatorDetailsOverlay.vue:145
+#: src/components/staking/ValidatorDetailsOverlay.vue:157
 msgid "Successfully changed validator to {validator}"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:291
+#: src/components/staking/StakingInfoPage.vue:299
 msgid "Successfully deactivated {amount} NIM"
 msgstr ""
 
-#: src/components/staking/StakingGraphPage.vue:247
+#: src/components/staking/StakingGraphPage.vue:267
 msgid "Successfully deactivated {amount} NIM from your stake with {validator}"
 msgstr ""
 
-#: src/components/staking/StakingGraphPage.vue:168
+#: src/components/staking/StakingGraphPage.vue:174
 msgid "Successfully staked {amount} NIM with {validator}"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:370
+#: src/components/staking/StakingInfoPage.vue:384
 msgid "Successfully unstaked {amount} NIM"
 msgstr ""
 

diff --git a/src/i18n/es.po b/src/i18n/es.po
@@ -954,7 +954,7 @@ msgstr "Intercambios de cripto estan actualmente en mantenimiento."
 msgid "Deactivate validator"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:257
+#: src/components/staking/StakingInfoPage.vue:258
 msgid "Deactivating Stake"
 msgstr ""
 
@@ -2425,7 +2425,7 @@ msgid "Send, receive and hold BTC in your wallet."
 msgstr "Envíe, reciba y almacene BTC en su billetera."
 
 #: src/components/staking/StakingGraphPage.vue:136
-#: src/components/staking/StakingGraphPage.vue:218
+#: src/components/staking/StakingGraphPage.vue:231
 msgid "Sending Staking Transaction"
 msgstr ""
 
@@ -2435,7 +2435,7 @@ msgstr ""
 msgid "Sending Transaction"
 msgstr "Enviando Transacción"
 
-#: src/components/staking/StakingInfoPage.vue:320
+#: src/components/staking/StakingInfoPage.vue:328
 msgid "Sending Unstaking Transaction"
 msgstr ""
 
@@ -2579,10 +2579,10 @@ msgstr "Omitir"
 #: src/components/modals/SendModal.vue:636
 #: src/components/modals/SendModal.vue:821
 #: src/components/modals/StablecoinSendModal.vue:677
-#: src/components/staking/StakingGraphPage.vue:272
-#: src/components/staking/StakingInfoPage.vue:307
-#: src/components/staking/StakingInfoPage.vue:384
-#: src/components/staking/ValidatorDetailsOverlay.vue:161
+#: src/components/staking/StakingGraphPage.vue:292
+#: src/components/staking/StakingInfoPage.vue:315
+#: src/components/staking/StakingInfoPage.vue:398
+#: src/components/staking/ValidatorDetailsOverlay.vue:173
 msgid "Something went wrong"
 msgstr "Algo ha salido mal"
 
@@ -2654,27 +2654,27 @@ msgstr ""
 msgid "Store of value, got it"
 msgstr "Reserva de valor, entendido"
 
-#: src/components/staking/StakingGraphPage.vue:205
+#: src/components/staking/StakingGraphPage.vue:218
 msgid "Successfully added {amount} NIM to your stake with {validator}"
 msgstr ""
 
-#: src/components/staking/ValidatorDetailsOverlay.vue:145
+#: src/components/staking/ValidatorDetailsOverlay.vue:157
 msgid "Successfully changed validator to {validator}"
 msgstr "Cambio el validador exitosamente a {validator}"
 
-#: src/components/staking/StakingInfoPage.vue:291
+#: src/components/staking/StakingInfoPage.vue:299
 msgid "Successfully deactivated {amount} NIM"
 msgstr ""
 
-#: src/components/staking/StakingGraphPage.vue:247
+#: src/components/staking/StakingGraphPage.vue:267
 msgid "Successfully deactivated {amount} NIM from your stake with {validator}"
 msgstr ""
 
-#: src/components/staking/StakingGraphPage.vue:168
+#: src/components/staking/StakingGraphPage.vue:174
 msgid "Successfully staked {amount} NIM with {validator}"
 msgstr ""
 
-#: src/components/staking/StakingInfoPage.vue:370
+#: src/components/staking/StakingInfoPage.vue:384
 msgid "Successfully unstaked {amount} NIM"
 msgstr ""