Update Staking UI (hacky)

Request parsing should happen in SignStakingApi, not ad-hoc in the UI logic.
nimiq · Nov 19, 2024 · 30e22f4 · 30e22f4
1 parent 7229e6a
commit 30e22f4
Show file tree

Hide file tree

Showing 16 changed files with 238 additions and 145 deletions.
diff --git a/client/src/PublicRequest.ts b/client/src/PublicRequest.ts
@@ -194,6 +194,11 @@ export type SignStakingRequest = SimpleRequest & {
     transaction: Uint8Array | Uint8Array[], // An array is only allowed for retire_stake + remove_stake transactions
     senderLabel?: string,
     recipientLabel?: string,
+    validatorAddress?: string,
+    validatorImageUrl?: string,
+    fromValidatorAddress?: string,
+    fromValidatorImageUrl?: string,
+    amount?: number,
 };
 
 export type SignBtcTransactionRequestStandard = SimpleRequest & BitcoinTransactionInfo & {

diff --git a/src/lib/RequestParser.js b/src/lib/RequestParser.js
@@ -385,7 +385,7 @@ class RequestParser { // eslint-disable-line no-unused-vars
      */
     _parseUrl(url, parameterName) {
         const parsedUrl = new URL(url);
-        const whitelistedProtocols = ['https:', 'http:', 'chrome-extension:', 'moz-extension:'];
+        const whitelistedProtocols = ['https:', 'http:', 'chrome-extension:', 'moz-extension:', 'data:'];
         if (!whitelistedProtocols.includes(parsedUrl.protocol)) {
             const protocolString = whitelistedProtocols.join(', ');
             throw new Errors.InvalidRequestError(`${parameterName} protocol must be one of: ${protocolString}`);

diff --git a/src/request/sign-staking/SignStaking.css b/src/request/sign-staking/SignStaking.css
@@ -147,10 +147,3 @@
     opacity: 0.5;
     margin-bottom: 0.25rem;
 }
-
-#confirm-staking .data-section {
-    margin: 1rem 3rem;
-    text-align: center;
-    max-width: 100%;
-    overflow-wrap: break-word;
-}
diff --git a/src/request/sign-staking/SignStaking.js b/src/request/sign-staking/SignStaking.js
diff --git a/src/request/sign-staking/SignStakingApi.js b/src/request/sign-staking/SignStakingApi.js
@@ -40,6 +40,30 @@ class SignStakingApi extends TopLevelApi { // eslint-disable-line no-unused-vars
             }
         }
 
+        if (request.validatorAddress) {
+            parsedRequest.validatorAddress = this.parseAddress(request.validatorAddress, 'validatorAddress', false);
+        }
+
+        if (request.validatorImageUrl) {
+            parsedRequest.validatorImageUrl = this._parseUrl(request.validatorImageUrl, 'validatorImageUrl');
+        }
+
+        if (request.fromValidatorAddress) {
+            parsedRequest.validatorAddress = this.parseAddress(
+                request.fromValidatorAddress,
+                'fromValidatorAddress',
+                false,
+            );
+        }
+
+        if (request.fromValidatorImageUrl) {
+            parsedRequest.fromValidatorImageUrl = this._parseUrl(request.fromValidatorImageUrl, 'fromValidatorImageUrl');
+        }
+
+        if (request.amount) {
+            parsedRequest.amount = this.parseNonNegativeFiniteNumber(request.amount, true, 'amount');
+        }
+
         return parsedRequest;
     }
 

diff --git a/src/request/sign-staking/index.html b/src/request/sign-staking/index.html
@@ -84,7 +84,7 @@
             </div>
             <div id="effect-container">
                 <div class="page-header nq-card-header">
-                    <h1 data-i18n="sign-tx-heading-tx" class="nq-h1">Confirm Transaction</h1>
+                    <h1 id="headline" class="nq-h1"></h1>
                 </div>
 
                 <div class="page-body nq-card-body transaction">
@@ -102,8 +102,6 @@ <h1 data-i18n="sign-tx-heading-tx" class="nq-h1">Confirm Transaction</h1>
                         <div class="fee-section nq-text-s display-none">
                             + <span id="fee"></span> <span class="nim-symbol"></span> <span data-i18n="sign-tx-fee">fee</span>
                         </div>
-
-                        <div class="data-section display-none nq-text nq-blue" id="data"></div>
                     </div>
                 </div>
 

diff --git a/src/translations/de.json b/src/translations/de.json
@@ -69,6 +69,10 @@
     "sign-tx-fee": "Gebühr",
     "sign-tx-cancel-payment": "Zahlung abbrechen",
 
+    "sign-staking-heading-stake": "Stake NIM",
+    "sign-staking-heading-unstake": "Unstake NIM",
+    "sign-staking-heading-change": "Change Validator",
+
     "sign-msg-heading": "Nachricht signieren",
     "sign-msg-signer": "Unterzeichner",
 

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -69,6 +69,10 @@
     "sign-tx-fee": "fee",
     "sign-tx-cancel-payment": "Cancel payment",
 
+    "sign-staking-heading-stake": "Stake NIM",
+    "sign-staking-heading-unstake": "Unstake NIM",
+    "sign-staking-heading-change": "Change Validator",
+
     "sign-msg-heading": "Sign Message",
     "sign-msg-signer": "Signer",
 

diff --git a/src/translations/es.json b/src/translations/es.json
@@ -69,6 +69,10 @@
     "sign-tx-fee": "cuota",
     "sign-tx-cancel-payment": "Cancelar pago",
 
+    "sign-staking-heading-stake": "Stake NIM",
+    "sign-staking-heading-unstake": "Unstake NIM",
+    "sign-staking-heading-change": "Change Validator",
+
     "sign-msg-heading": "Firmar Mensaje",
     "sign-msg-signer": "Firmador",
 

diff --git a/src/translations/fr.json b/src/translations/fr.json
@@ -69,6 +69,10 @@
     "sign-tx-fee": "frais",
     "sign-tx-cancel-payment": "Annuler le paiement",
 
+    "sign-staking-heading-stake": "Stake NIM",
+    "sign-staking-heading-unstake": "Unstake NIM",
+    "sign-staking-heading-change": "Change Validator",
+
     "sign-msg-heading": "Signer le Message",
     "sign-msg-signer": "Signataire",
 

diff --git a/src/translations/nl.json b/src/translations/nl.json
@@ -69,6 +69,10 @@
     "sign-tx-fee": "kosten",
     "sign-tx-cancel-payment": "Annuleer betaling",
 
+    "sign-staking-heading-stake": "Stake NIM",
+    "sign-staking-heading-unstake": "Unstake NIM",
+    "sign-staking-heading-change": "Change Validator",
+
     "sign-msg-heading": "Bericht ondertekenen",
     "sign-msg-signer": "Ondertekenaar",
 

diff --git a/src/translations/pt.json b/src/translations/pt.json
@@ -69,6 +69,10 @@
     "sign-tx-fee": "taxa",
     "sign-tx-cancel-payment": "Cancelar pagamento",
 
+    "sign-staking-heading-stake": "Stake NIM",
+    "sign-staking-heading-unstake": "Unstake NIM",
+    "sign-staking-heading-change": "Change Validator",
+
     "sign-msg-heading": "Assinar Mensagem",
     "sign-msg-signer": "Signatário",
 

diff --git a/src/translations/ru.json b/src/translations/ru.json
@@ -69,6 +69,10 @@
     "sign-tx-fee": "комиссия",
     "sign-tx-cancel-payment": "Отменить платёж",
 
+    "sign-staking-heading-stake": "Stake NIM",
+    "sign-staking-heading-unstake": "Unstake NIM",
+    "sign-staking-heading-change": "Change Validator",
+
     "sign-msg-heading": "Подписать сообщение",
     "sign-msg-signer": "Отправитель",
 

diff --git a/src/translations/uk.json b/src/translations/uk.json
@@ -69,6 +69,10 @@
     "sign-tx-fee": "комісія",
     "sign-tx-cancel-payment": "Скасувати платіж",
 
+    "sign-staking-heading-stake": "Stake NIM",
+    "sign-staking-heading-unstake": "Unstake NIM",
+    "sign-staking-heading-change": "Change Validator",
+
     "sign-msg-heading": "Підписати повідомлення",
     "sign-msg-signer": "Підписант",
 

diff --git a/src/translations/zh.json b/src/translations/zh.json
@@ -69,6 +69,10 @@
     "sign-tx-fee": "手续费",
     "sign-tx-cancel-payment": "取消付款",
 
+    "sign-staking-heading-stake": "Stake NIM",
+    "sign-staking-heading-unstake": "Unstake NIM",
+    "sign-staking-heading-change": "Change Validator",
+
     "sign-msg-heading": "签署信息",
     "sign-msg-signer": "签署者",
 

diff --git a/types/Keyguard.d.ts b/types/Keyguard.d.ts
@@ -286,7 +286,13 @@ type Parsed<T extends KeyguardRequest.Request> =
     T extends Is<T, KeyguardRequest.SignStakingRequest> ?
         Transform<KeyId2KeyInfo<KeyguardRequest.SignStakingRequest> & {
             plain: Nimiq.PlainTransaction[],
-        }, 'transaction', { transactions: Nimiq.Transaction[] }> :
+        }, 'transaction' | 'validatorAddress' | 'validatorImageUrl' | 'fromValidatorAddress' | 'fromValidatorImageUrl', {
+            transactions: Nimiq.Transaction[],
+            validatorAddress?: Nimiq.Address,
+            validatorImageUrl?: URL,
+            fromValidatorAddress?: Nimiq.Address,
+            fromValidatorImageUrl?: URL,
+        }> :
     T extends Is<T, KeyguardRequest.SignMessageRequest> ?
         Transform<
             KeyId2KeyInfo<KeyguardRequest.SignMessageRequest>,