fixed fee direction
This commit is contained in:
@@ -272,11 +272,11 @@ func executionMessage(result *ExecutionResult) string {
|
||||
balanceCurrency = strings.TrimSpace(result.NewBalance.Currency)
|
||||
}
|
||||
}
|
||||
return op + " completed.\n\n" +
|
||||
"Account: " + requestAccountCode(request) + "\n" +
|
||||
"Amount: " + sign + strings.TrimSpace(request.Amount) + " " + strings.TrimSpace(request.Currency) + "\n" +
|
||||
"New balance: " + balanceAmount + " " + balanceCurrency + "\n\n" +
|
||||
"Reference: " + strings.TrimSpace(request.RequestID)
|
||||
return "*" + op + " completed*\n\n" +
|
||||
"*Account:* " + markdownCode(requestAccountCode(request)) + "\n" +
|
||||
"*Amount:* " + markdownCode(sign+strings.TrimSpace(request.Amount)+" "+strings.TrimSpace(request.Currency)) + "\n" +
|
||||
"*New balance:* " + markdownCode(balanceAmount+" "+balanceCurrency) + "\n\n" +
|
||||
"*Reference:* " + markdownCode(strings.TrimSpace(request.RequestID))
|
||||
case storagemodel.TreasuryRequestStatusFailed:
|
||||
reason := strings.TrimSpace(request.ErrorMessage)
|
||||
if reason == "" && result.ExecutionError != nil {
|
||||
@@ -285,12 +285,12 @@ func executionMessage(result *ExecutionResult) string {
|
||||
if reason == "" {
|
||||
reason = "Unknown error."
|
||||
}
|
||||
return "Execution failed.\n\n" +
|
||||
"Account: " + requestAccountCode(request) + "\n" +
|
||||
"Amount: " + strings.TrimSpace(request.Amount) + " " + strings.TrimSpace(request.Currency) + "\n" +
|
||||
"Status: FAILED\n\n" +
|
||||
"Reason:\n" + reason + "\n\n" +
|
||||
"Request ID: " + strings.TrimSpace(request.RequestID)
|
||||
return "*Execution failed*\n\n" +
|
||||
"*Account:* " + markdownCode(requestAccountCode(request)) + "\n" +
|
||||
"*Amount:* " + markdownCode(strings.TrimSpace(request.Amount)+" "+strings.TrimSpace(request.Currency)) + "\n" +
|
||||
"*Status:* " + markdownCode("FAILED") + "\n" +
|
||||
"*Reason:* " + markdownCode(compactForMarkdown(reason)) + "\n\n" +
|
||||
"*Request ID:* " + markdownCode(strings.TrimSpace(request.RequestID))
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
@@ -305,3 +305,23 @@ func requestAccountCode(request *storagemodel.TreasuryRequest) string {
|
||||
}
|
||||
return strings.TrimSpace(request.LedgerAccountID)
|
||||
}
|
||||
|
||||
func markdownCode(value string) string {
|
||||
value = strings.TrimSpace(value)
|
||||
if value == "" {
|
||||
value = "N/A"
|
||||
}
|
||||
value = strings.ReplaceAll(value, "`", "'")
|
||||
return "`" + value + "`"
|
||||
}
|
||||
|
||||
func compactForMarkdown(value string) string {
|
||||
value = strings.TrimSpace(value)
|
||||
if value == "" {
|
||||
return "Unknown error."
|
||||
}
|
||||
value = strings.ReplaceAll(value, "\r\n", " ")
|
||||
value = strings.ReplaceAll(value, "\n", " ")
|
||||
value = strings.ReplaceAll(value, "\r", " ")
|
||||
return strings.Join(strings.Fields(value), " ")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user