btoconnor

diff --git a/issuing-disputes-service/issuing-disputes-service-client/src/main/proto/squareup/cash/issuingdisputesservice/api/issuing_dispute.proto b/issuing-disputes-service/issuing-disputes-service-client/src/main/proto/squareup/cash/issuingdisputesservice/api/issuing_dispute.proto
index 09aacfc6b783..1e77207de075 100644
--- a/issuing-disputes-service/issuing-disputes-service-client/src/main/proto/squareup/cash/issuingdisputesservice/api/issuing_dispute.proto
+++ b/issuing-disputes-service/issuing-disputes-service-client/src/main/proto/squareup/cash/issuingdisputesservice/api/issuing_dispute.proto
@@ -55,35 +55,43 @@ message IssuingDisputeUpdate {
   // The time at which the update happened
   optional google.protobuf.Timestamp occurred_at = 4;
 
   // Update triggered as a result of
   optional IssuingDisputeUpdateTrigger trigger = 5;

btoconnor

diff --git a/issuing-disputes-service/service/src/main/kotlin/com/squareup/cash/issuingdisputesservice/IssuingDisputesServiceAccessModule.kt b/issuing-disputes-service/service/src/main/kotlin/com/squareup/cash/issuingdisputesservice/IssuingDisputesServiceAccessModule.kt
index 996936e12bfd..c427afccd82b 100644
--- a/issuing-disputes-service/service/src/main/kotlin/com/squareup/cash/issuingdisputesservice/IssuingDisputesServiceAccessModule.kt
+++ b/issuing-disputes-service/service/src/main/kotlin/com/squareup/cash/issuingdisputesservice/IssuingDisputesServiceAccessModule.kt
@@ -19,7 +19,7 @@ internal class IssuingDisputesServiceAccessModule : KAbstractModule() {
     multibind<AccessAnnotationEntry>()
       .toInstance(
         AccessAnnotationEntry<IssuingDisputesServiceApiAccess>(
-          services = listOf("disputron"),
+          services = listOf("disputron", "card-disputer"),

btoconnor

diff --git a/service/src/test/kotlin/com/squareup/cash/issuingdisputesservice/workflows/MerchantResolutionWorkflowTest.kt b/service/src/test/kotlin/com/squareup/cash/issuingdisputesservice/workflows/MerchantResolutionWorkflowTest.kt
index 0de7f780..70df7044 100644
--- a/service/src/test/kotlin/com/squareup/cash/issuingdisputesservice/workflows/MerchantResolutionWorkflowTest.kt
+++ b/service/src/test/kotlin/com/squareup/cash/issuingdisputesservice/workflows/MerchantResolutionWorkflowTest.kt
@@ -191,31 +191,31 @@ class MerchantResolutionWorkflowTest : BaseDisputeTest() {
         cwf.workflowStub.resolveDisputeWithMerchant(
           MerchantResolutionWorkflowInput(
             requestToken = requestToken,
             disputeCaseToken = disputeCaseToken,
             amount = Money.ofUsd(1000),

btoconnor

diff --git a/service/src/test/kotlin/com/squareup/cash/issuingdisputesservice/workflows/MerchantResolutionWorkflowTest.kt b/service/src/test/kotlin/com/squareup/cash/issuingdisputesservice/workflows/MerchantResolutionWorkflowTest.kt
index 0de7f780..70df7044 100644
--- a/service/src/test/kotlin/com/squareup/cash/issuingdisputesservice/workflows/MerchantResolutionWorkflowTest.kt
+++ b/service/src/test/kotlin/com/squareup/cash/issuingdisputesservice/workflows/MerchantResolutionWorkflowTest.kt
@@ -191,31 +191,31 @@ class MerchantResolutionWorkflowTest : BaseDisputeTest() {
         cwf.workflowStub.resolveDisputeWithMerchant(
           MerchantResolutionWorkflowInput(
             requestToken = requestToken,
             disputeCaseToken = disputeCaseToken,
             amount = Money.ofUsd(1000),

btoconnor

diff --git a/music_assistant/providers/heos/__init__.py b/music_assistant/providers/heos/__init__.py
new file mode 100644
index 00000000..d6e3cb42
--- /dev/null
+++ b/music_assistant/providers/heos/__init__.py
@@ -0,0 +1,510 @@
+"""
+DEMO/TEMPLATE Player Provider for Music Assistant.
+
+This is an empty player provider with no actual implementation.

btoconnor

diff --git a/marketplace-server/src/main/java/com/tidal/marketplace/service/stripe/StripeService.java b/marketplace-server/src/main/java/com/tidal/marketplace/service/stripe/StripeService.java
index 62865df..70392e5 100644
--- a/marketplace-server/src/main/java/com/tidal/marketplace/service/stripe/StripeService.java
+++ b/marketplace-server/src/main/java/com/tidal/marketplace/service/stripe/StripeService.java
@@ -12,65 +12,78 @@ import com.stripe.param.AccountCreateParams;
 import com.stripe.param.AccountLinkCreateParams;
 import com.stripe.param.checkout.SessionCreateParams;
 import com.tidal.marketplace.exception.MarketplaceException;
 import com.tidal.marketplace.model.db.ListingEntity;
 import com.tidal.marketplace.model.db.ListingOfferingEntity;

btoconnor

diff --git a/tvapp/tuner/base.py b/tvapp/tuner/base.py
index 9a12e96..50195ea 100644
--- a/tvapp/tuner/base.py
+++ b/tvapp/tuner/base.py
@@ -168,28 +168,38 @@ class Tuner:
         # self.tunerproc = None
         subprocess.call("rm " + STREAMDIR+self.prefix+"*", shell=True)
         self.status = 'Stopped'
 
     def check_stream(self, curtime):

btoconnor

diff --git a/tvapp/tuner/antenna.py b/tvapp/tuner/antenna.py
index f6c9615..f34105b 100644
--- a/tvapp/tuner/antenna.py
+++ b/tvapp/tuner/antenna.py
@@ -85,119 +85,136 @@ class AntennaTuner(Tuner):
         "WMPB",  # PBS
         "CW",  # CW
     ]
 
     def __init__(self, url, prefix, type_, channels, channel_file_location):

btoconnor

diff --git a/tvapp/tuner/antenna.py b/tvapp/tuner/antenna.py
index f6c9615..f34105b 100644
--- a/tvapp/tuner/antenna.py
+++ b/tvapp/tuner/antenna.py
@@ -97,9 +97,11 @@ class AntennaTuner(Tuner):
         Tuner.__init__(self, "unused_str_adapter_%s" % url, prefix, type_)
         self.encoder_cmd = None
         self.tuner_cmd = None
+        self.monitor_cmd = None
 

btoconnor

diff --git a/fw/main/CMakeLists.txt b/fw/main/CMakeLists.txt
index f8b09c7..c4c2552 100644
--- a/fw/main/CMakeLists.txt
+++ b/fw/main/CMakeLists.txt
@@ -1,5 +1,5 @@
 idf_component_register(
     SRCS "main.c" "battery.c" "bme280.c" "datalog.c" "deepsleep.c"
-         "network.c" "ota.c" "mqtt.c"
+         "network.c" "ota.c" "mqtt.c" "homeassistant.c"
     INCLUDE_DIRS "."