Skip to content

Commit d2cd5fa

Browse files
author
Mak Muftic
committed
Show prompts only on manual payout
1 parent 8479f34 commit d2cd5fa

4 files changed

Lines changed: 16 additions & 13 deletions

File tree

cmd/payout.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var payoutCmd = &cobra.Command{
2525
Run: payoutCommand,
2626
Args: func(cmd *cobra.Command, args []string) error {
2727
var err error
28-
totalRewardAsFloat64, err = ValidatePayoutFlags(totalReward, feeAddress)
28+
totalRewardAsFloat64, err = ValidatePayoutFlags(totalReward, feeAddress, true)
2929
if err != nil {
3030
return err
3131
}

cmd/start.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ var startCmd = &cobra.Command{
116116
if payoutNumberOfDays <= 0 {
117117
return errors.New("invalid payout interval")
118118
}
119-
rewardAsFloat64, err := ValidatePayoutFlags(payoutTotalReward, payoutFeeAddress)
119+
rewardAsFloat64, err := ValidatePayoutFlags(payoutTotalReward, payoutFeeAddress, false)
120120
if err != nil {
121121
return err
122122
}

cmd/validation.go

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
func ValidatePayoutFlags(
1111
payoutReward string,
1212
payoutAddress string,
13+
showPrompts bool,
1314
) (float64, error) {
1415
var err error
1516
var rewardAsFloat64 float64
@@ -18,16 +19,18 @@ func ValidatePayoutFlags(
1819
if payoutAddress == "" {
1920
return 0, errors.New("Unable to set reward amount to entire wallet balance if fee address not provided")
2021
} else {
21-
confirmed, err := prompts.ShowConfirmationPrompt(
22-
fmt.Sprintf("You choose that reward amount is defined as entire balance on lb wallet!" +
23-
"On payout entire balance will be distributed as reward and lb fee will be sent to address %s",
24-
payoutAddress),
25-
)
26-
if err != nil {
27-
return 0, err
28-
}
29-
if !confirmed {
30-
return 0, errors.New("Payout configuration canceled")
22+
if showPrompts {
23+
confirmed, err := prompts.ShowConfirmationPrompt(
24+
fmt.Sprintf("You choose that reward amount is defined as entire balance on lb wallet!" +
25+
"On payout entire balance will be distributed as reward and lb fee will be sent to address %s",
26+
payoutAddress),
27+
)
28+
if err != nil {
29+
return 0, err
30+
}
31+
if !confirmed {
32+
return 0, errors.New("Payout configuration canceled")
33+
}
3134
}
3235
}
3336
} else {

cmd/validation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestValidatePayoutFlags(t *testing.T) {
3030
}
3131
for _, test := range tests {
3232
t.Run(test.name, func(t *testing.T) {
33-
rewAsFloat64, err := ValidatePayoutFlags(test.payoutReward, test.payoutAddress)
33+
rewAsFloat64, err := ValidatePayoutFlags(test.payoutReward, test.payoutAddress, false)
3434
assert.Equal(t, test.validateReturns, rewAsFloat64)
3535
if test.validateError {
3636
assert.Error(t, err)

0 commit comments

Comments
 (0)