Skip to content

Commit

Permalink
fix collateral alert popup
Browse files Browse the repository at this point in the history
  • Loading branch information
gpdionisio committed May 16, 2018
1 parent 887c94e commit 57222fa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions src/tabRewards.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def onChangeSelectedMN(self):
@pyqtSlot()
def onSelectAllRewards(self):
self.ui.rewardsList.box.selectAll()
self.updateSelection()
self.updateSelection()


@pyqtSlot()
Expand All @@ -216,8 +216,9 @@ def onSendRewards(self):
self.caller.myPopUp2(QMessageBox.Critical, 'SPMT - PIVX address check', "Invalid Destination Address")
return None

# Check Noob spending collateral
if (self.ui.rewardsList.box.collateralRow is not None and
# Check spending collateral
if (not self.ui.collateralHidden and
self.ui.rewardsList.box.collateralRow is not None and
self.ui.rewardsList.box.item(self.ui.rewardsList.box.collateralRow, 0).isSelected() ):
warning1 = "Are you sure you want to transfer the collateral?"
warning2 = "Really?"
Expand All @@ -236,7 +237,8 @@ def onSendRewards(self):

# LET'S GO
if self.selectedRewards:
printDbg("Sending from PIVX address %s to PIVX address %s " % (self.curr_addr, self.dest_addr))
printDbg("Sending from PIVX address %s to PIVX address %s " % (self.curr_addr, self.dest_addr))
printDbg("Preparing transaction. Please wait...")
self.currFee = self.ui.feeLine.value() * 1e8
# connect signal
self.caller.hwdevice.sigTxdone.connect(self.FinishSend)
Expand Down
2 changes: 1 addition & 1 deletion src/version.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"number": "0.1.0",
"tag": "b",
"tag": "c",
"comments": ["first release"]
}

0 comments on commit 57222fa

Please sign in to comment.