mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-03-12 10:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix dialog results optionality nesting to match dialogOpt (#3479)

Browse source
This commit is contained in:
user411 2021-08-04 13:25:53 -06:00 • committed by GitHub
parent b39ca47268
commit 2dd348a79f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/AcceptOfferDialog.scala
View file

@ -65,7 +65,7 @@ class AcceptOfferDialog extends CliCommandProducer[AcceptDLCCliCommand] {
val result = dialogOpt.map(_.showAndWait())
result match {
case Some(Some(cmd: AcceptDLCCliCommand)) =>
case Some(Some(Some(cmd: AcceptDLCCliCommand))) =>
Some(cmd)
case Some(_) | None => None
}

2
app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/BroadcastDLCDialog.scala
View file

@ -73,7 +73,7 @@ object BroadcastDLCDialog
val result = dialogOpt.map(_.showAndWait())
result match {
case Some(Some(cmd: AddDLCSigsAndBroadcastCliCommand)) =>
case Some(Some(Some(cmd: AddDLCSigsAndBroadcastCliCommand))) =>
Some(cmd)
case Some(_) | None => None
}

4
app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/CreateDLCOfferDialog.scala
View file

@ -59,8 +59,8 @@ class CreateDLCOfferDialog
val result = dialogOpt.map(_.showAndWait())
result match {
case Some(Some(offer: CreateDLCOffer)) => Some(offer)
case Some(_) | None => None
case Some(Some(Some(offer: CreateDLCOffer))) => Some(offer)
case Some(_) | None => None
}
}

4
app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/SignDLCDialog.scala
View file

@ -35,7 +35,7 @@ object SignDLCDialog
}
}
var dialogOpt: Option[Dialog[Option[SignDLCCliCommand]]] = None
private var dialogOpt: Option[Dialog[Option[SignDLCCliCommand]]] = None
def showAndWait(
parentWindow: Window,
@ -74,7 +74,7 @@ object SignDLCDialog
val result = dialogOpt.map(_.showAndWait())
result match {
case Some(Some(cmd: SignDLCCliCommand)) =>
case Some(Some(Some(cmd: SignDLCCliCommand))) =>
Some(cmd)
case Some(_) | None => None
}