Merge branch 'satstring'

Author: benma

backend/coins/btc/handlers/handlers.go

@@ -22,6 +22,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 
@@ -272,7 +273,7 @@ func (input *sendTxInput) UnmarshalJSON(jsonBytes []byte) error {
 		SendAll   string `json:"sendAll"`
 		FeeTarget string `json:"feeTarget"`
 		// Provided in Sat/vByte, will be converted to Sat/vKb.
-		FeePerByte    float64  `json:"feePerByte"`
+		FeePerByte    string   `json:"feePerByte"`
 		Amount        string   `json:"amount"`
 		SelectedUTXOS []string `json:"selectedUTXOS"`
 		Data          string   `json:"data"`
@@ -288,7 +289,13 @@ func (input *sendTxInput) UnmarshalJSON(jsonBytes []byte) error {
 	if err != nil {
 		return errp.WithMessage(err, "Failed to retrieve fee target code")
 	}
-	input.FeePerKb = btcutil.Amount(jsonBody.FeePerByte * 1000)
+	if input.FeeTargetCode == accounts.FeeTargetCodeCustom {
+		feePerKb, err := strconv.ParseFloat(jsonBody.FeePerByte, 64)
+		if err != nil {
+			return err
+		}
+		input.FeePerKb = btcutil.Amount(feePerKb * 1000)
+	}
 	if jsonBody.SendAll == "yes" {
 		input.Amount = coin.NewSendAmountAll()
 	} else {

frontends/web/src/routes/account/send/feetargets.tsx

@@ -38,10 +38,10 @@ interface FeeTargetsProps {
     disabled: boolean;
     fiatUnit: Fiat;
     proposedFee?: AmountWithConversions;
-    feePerByte: number;
+    feePerByte: string;
     showCalculatingFeeLabel?: boolean;
     onFeeTargetChange: (code: Code) => void;
-    onFeePerByte: (feePerByte: number) => void;
+    onFeePerByte: (feePerByte: string) => void;
     error?: string;
 }
 
@@ -104,7 +104,7 @@ class FeeTargets extends Component<Props, State> {
 
     private handleFeePerByte = (event: Event) => {
         const target = event.target as HTMLInputElement;
-        this.props.onFeePerByte(Number(target.value));
+        this.props.onFeePerByte(target.value);
     }
 
     private setFeeTarget = (feeTarget: Code) => {

frontends/web/src/routes/account/send/send.tsx

@@ -83,7 +83,7 @@ interface State {
     fiatUnit: Fiat;
     sendAll: boolean;
     feeTarget?: FeeCode;
-    feePerByte: number;
+    feePerByte: string;
     isConfirming: boolean;
     isSent: boolean;
     isAborted: boolean;
@@ -134,7 +134,7 @@ class Send extends Component<Props, State> {
         activeScanQR: false,
         videoLoading: false,
         note: '',
-        feePerByte: 1,
+        feePerByte: '',
     };
 
     private coinSupportsCoinControl = () => {
@@ -234,7 +234,7 @@ class Send extends Component<Props, State> {
                     amount: undefined,
                     data: undefined,
                     note: '',
-                    feePerByte: 1,
+                    feePerByte: '',
                 });
                 if (this.utxos) {
                     (this.utxos as any).getWrappedInstance().clear();
@@ -268,7 +268,7 @@ class Send extends Component<Props, State> {
 
     private sendDisabled = () => {
         const txInput = this.txInput();
-        return !txInput.address || this.state.feeTarget === undefined || (txInput.sendAll === 'no' && !txInput.amount);
+        return !txInput.address || this.state.feeTarget === undefined || (txInput.sendAll === 'no' && !txInput.amount) || (this.state.feeTarget === 'custom' && !this.state.feePerByte);
     }
 
     private validateAndDisplayFee = (updateFiat: boolean = true) => {

frontends/web/test/routes/account/send/feetargets.test.tsx

@@ -75,7 +75,7 @@ describe('routes/account/send/feetargets', () => {
                         USD: '0.02',
                     },
                 }}
-                feePerByte={1}
+                feePerByte=""
                 onFeePerByte={jest.fn()}
                 onFeeTargetChange={jest.fn()} />,
         );
@@ -94,7 +94,7 @@ describe('routes/account/send/feetargets', () => {
                 coinCode="eth"
                 disabled={false}
                 fiatUnit="EUR"
-                feePerByte={1}
+                feePerByte=""
                 onFeePerByte={jest.fn()}
                 onFeeTargetChange={jest.fn()} />,
         );
@@ -121,7 +121,7 @@ describe('routes/account/send/feetargets', () => {
                 coinCode="btc"
                 disabled={false}
                 fiatUnit="USD"
-                feePerByte={1}
+                feePerByte=""
                 onFeePerByte={jest.fn()}
                 onFeeTargetChange={onFeeTargetChangeCB} />,
         );