From d42e37ce1eb421a9dcf59e70ff81322f32d2a263 Mon Sep 17 00:00:00 2001 From: Ross Savage <551697+dangeross@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:06:21 +0200 Subject: [PATCH] Fix CI and notfication plugin issues (#485) --- .github/workflows/build-bindings-flutter.yml | 22 +++++++++++++++++++ .../job/LnurlPayInvoice.kt | 2 +- .../BreezSDKLiquid/Task/LnurlPayInvoice.swift | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings-flutter.yml b/.github/workflows/build-bindings-flutter.yml index 3386d18..81626a1 100644 --- a/.github/workflows/build-bindings-flutter.yml +++ b/.github/workflows/build-bindings-flutter.yml @@ -23,8 +23,30 @@ on: default: false jobs: + setup: + if: ${{ !inputs.use-dummy-binaries }} + runs-on: macOS-latest + name: Setup + steps: + - name: Disk Cleanup + run: | + echo "::group::Free space before cleanup" + df -hI + echo "::endgroup::" + echo "::group::Cleaned Files" + sudo rm -rf /Applications/Xcode_14.3.1.app + sudo rm -rf /Applications/Xcode_15.0.1.app + sudo rm -rf /Applications/Xcode_15.1.app + sudo rm -rf /Applications/Xcode_15.2.app + sudo rm -rf /Applications/Xcode_15.3.app + echo "::endgroup::" + echo "::group::Free space after cleanup" + df -hI + echo "::endgroup::" + build: if: ${{ !inputs.use-dummy-binaries }} + needs: setup runs-on: macOS-latest name: Build Flutter bindings steps: diff --git a/lib/bindings/langs/android/lib/src/main/kotlin/breez_sdk_liquid_notification/job/LnurlPayInvoice.kt b/lib/bindings/langs/android/lib/src/main/kotlin/breez_sdk_liquid_notification/job/LnurlPayInvoice.kt index 70c9347..823267c 100644 --- a/lib/bindings/langs/android/lib/src/main/kotlin/breez_sdk_liquid_notification/job/LnurlPayInvoice.kt +++ b/lib/bindings/langs/android/lib/src/main/kotlin/breez_sdk_liquid_notification/job/LnurlPayInvoice.kt @@ -62,7 +62,7 @@ class LnurlPayInvoiceJob( DEFAULT_LNURL_PAY_METADATA_PLAIN_TEXT ) val prepareReceivePaymentRes = liquidSDK.prepareReceivePayment( - PrepareReceiveRequest(amountSat, PaymentMethod.LIGHTNING) + PrepareReceiveRequest(PaymentMethod.LIGHTNING, amountSat) ) val receivePaymentResponse = liquidSDK.receivePayment( ReceivePaymentRequest( diff --git a/lib/bindings/langs/swift/Sources/BreezSDKLiquid/Task/LnurlPayInvoice.swift b/lib/bindings/langs/swift/Sources/BreezSDKLiquid/Task/LnurlPayInvoice.swift index 23d9d54..c005099 100644 --- a/lib/bindings/langs/swift/Sources/BreezSDKLiquid/Task/LnurlPayInvoice.swift +++ b/lib/bindings/langs/swift/Sources/BreezSDKLiquid/Task/LnurlPayInvoice.swift @@ -45,7 +45,7 @@ class LnurlPayInvoiceTask : LnurlPayTask { } let plainTextMetadata = ResourceHelper.shared.getString(key: Constants.LNURL_PAY_METADATA_PLAIN_TEXT, fallback: Constants.DEFAULT_LNURL_PAY_METADATA_PLAIN_TEXT) let metadata = "[[\"text/plain\",\"\(plainTextMetadata)\"]]" - let prepareReceivePaymentRes = try liquidSDK.prepareReceivePayment(req: PrepareReceiveRequest(payerAmountSat: amountSat, paymentMethod: PaymentMethod.lightning)) + let prepareReceivePaymentRes = try liquidSDK.prepareReceivePayment(req: PrepareReceiveRequest(paymentMethod: PaymentMethod.lightning, payerAmountSat: amountSat)) let receivePaymentRes = try liquidSDK.receivePayment(req: ReceivePaymentRequest(prepareResponse: prepareReceivePaymentRes, description: metadata, useDescriptionHash: true)) self.replyServer(encodable: LnurlInvoiceResponse(pr: receivePaymentRes.destination, routes: []), replyURL: request!.reply_url) } catch let e {