mirror of
https://github.com/greenart7c3/Amber.git
synced 2026-10-06 03:18:23 +00:00
Do not re-add bunker requests on failed response in multi-event screen
When sending a bunker response fails in BunkerMultiEventHomeScreen, only show the error message instead of re-adding the request back to the pending requests list. https://claude.ai/code/session_015N9LewondeT2cgh3Mv25cR
This commit is contained in:
+5
-25
@@ -393,7 +393,6 @@ fun BunkerMultiEventHomeScreen(
|
||||
thisAccount.npub,
|
||||
)
|
||||
|
||||
val localBunkerRequest = request.copy()
|
||||
BunkerRequestUtils.remove(request.request.id)
|
||||
|
||||
if (request.checked.value) {
|
||||
@@ -404,11 +403,7 @@ fun BunkerMultiEventHomeScreen(
|
||||
BunkerResponse(request.request.id, localEvent.toJson(), null),
|
||||
application.application.relays,
|
||||
onLoading = {},
|
||||
onDone = {
|
||||
if (!it) {
|
||||
BunkerRequestUtils.addRequest(localBunkerRequest)
|
||||
}
|
||||
},
|
||||
onDone = {},
|
||||
)
|
||||
} else {
|
||||
AmberUtils.sendBunkerError(
|
||||
@@ -448,8 +443,7 @@ fun BunkerMultiEventHomeScreen(
|
||||
)
|
||||
|
||||
val signedMessage = thisAccount.signString(request.request.params.first())
|
||||
val localBunkerRequest = request.copy()
|
||||
BunkerRequestUtils.remove(localBunkerRequest.request.id)
|
||||
BunkerRequestUtils.remove(request.request.id)
|
||||
|
||||
if (request.checked.value) {
|
||||
BunkerRequestUtils.sendBunkerResponse(
|
||||
@@ -459,11 +453,7 @@ fun BunkerMultiEventHomeScreen(
|
||||
BunkerResponse(request.request.id, signedMessage, null),
|
||||
application.application.relays,
|
||||
onLoading = {},
|
||||
onDone = {
|
||||
if (!it) {
|
||||
BunkerRequestUtils.addRequest(localBunkerRequest)
|
||||
}
|
||||
},
|
||||
onDone = {},
|
||||
)
|
||||
} else {
|
||||
AmberUtils.sendBunkerError(
|
||||
@@ -492,7 +482,6 @@ fun BunkerMultiEventHomeScreen(
|
||||
thisAccount.npub,
|
||||
)
|
||||
|
||||
val localBunkerRequest = request.copy()
|
||||
BunkerRequestUtils.remove(request.request.id)
|
||||
if (request.checked.value) {
|
||||
BunkerRequestUtils.sendBunkerResponse(
|
||||
@@ -502,11 +491,7 @@ fun BunkerMultiEventHomeScreen(
|
||||
BunkerResponse(request.request.id, "", null),
|
||||
application.application.relays,
|
||||
onLoading = {},
|
||||
onDone = {
|
||||
if (!it) {
|
||||
BunkerRequestUtils.addRequest(localBunkerRequest)
|
||||
}
|
||||
},
|
||||
onDone = {},
|
||||
)
|
||||
} else {
|
||||
AmberUtils.sendBunkerError(
|
||||
@@ -553,7 +538,6 @@ fun BunkerMultiEventHomeScreen(
|
||||
)
|
||||
|
||||
val signature = request.encryptedData?.result ?: continue
|
||||
val localBunkerRequest = request.copy()
|
||||
BunkerRequestUtils.remove(request.request.id)
|
||||
if (request.checked.value) {
|
||||
BunkerRequestUtils.sendBunkerResponse(
|
||||
@@ -563,11 +547,7 @@ fun BunkerMultiEventHomeScreen(
|
||||
BunkerResponse(request.request.id, signature, null),
|
||||
application.application.relays,
|
||||
onLoading = {},
|
||||
onDone = {
|
||||
if (!it) {
|
||||
BunkerRequestUtils.addRequest(localBunkerRequest)
|
||||
}
|
||||
},
|
||||
onDone = {},
|
||||
)
|
||||
} else {
|
||||
AmberUtils.sendBunkerError(
|
||||
|
||||
Reference in New Issue
Block a user