Merge pull request #188 from golemfactory/status-settled-always-when-…

…paid

Set payment status to Settled always when Job is paid

Golem/Job.cs

@@ -117,6 +117,7 @@ public bool Active
             }
         }
 
+        public bool IsClosed { get => !Active; }
 
         public void UpdateActivityState(ActivityStatePair activityState)
         {
@@ -214,8 +215,7 @@ public static JobStatus ResolveTerminationReason(string? code)
             Logger.LogInformation($"Job: {this.Id}, confirmed sum: {confirmedSum}, job expected reward: {this.CurrentReward}");
 
             // Workaround for yagna unable to change status to SETTLED when using partial payments
-            if (suggestedPaymentStatus == GolemLib.Types.PaymentStatus.Accepted
-                && this.CurrentReward == confirmedSum)
+            if (this.IsClosed && this.CurrentReward == confirmedSum)
             {
                 return IntoPaymentStatus(InvoiceStatus.SETTLED);
             }