From f1ffd669110bdd246f78eeeba8eb75b7d3a34713 Mon Sep 17 00:00:00 2001
From: Thomas Ricouard <ricouard77@gmail.com>
Date: Wed, 12 Jun 2024 19:32:40 +0200
Subject: [PATCH] More progress

---
 .../Account/Sources/Account/AccountDetailHeaderView.swift     | 2 +-
 Packages/Account/Sources/Account/AccountDetailViewModel.swift | 4 ----
 Packages/Models/Sources/Models/Account.swift                  | 4 ++++
 .../StatusKit/Sources/StatusKit/Row/StatusRowViewModel.swift  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Packages/Account/Sources/Account/AccountDetailHeaderView.swift b/Packages/Account/Sources/Account/AccountDetailHeaderView.swift
index b2cfacb9..04ce61f8 100644
--- a/Packages/Account/Sources/Account/AccountDetailHeaderView.swift
+++ b/Packages/Account/Sources/Account/AccountDetailHeaderView.swift
@@ -219,7 +219,7 @@ struct AccountDetailHeaderView: View {
             .accessibilityRespondsToUserInteraction(false)
           movedToView
           joinedAtView
-          if viewModel.isProAccount && viewModel.relationship?.following == false {
+          if viewModel.account?.isProAccount == true && viewModel.relationship?.following == false {
             tipView
           }
         }
diff --git a/Packages/Account/Sources/Account/AccountDetailViewModel.swift b/Packages/Account/Sources/Account/AccountDetailViewModel.swift
index 791026a3..b992ddd0 100644
--- a/Packages/Account/Sources/Account/AccountDetailViewModel.swift
+++ b/Packages/Account/Sources/Account/AccountDetailViewModel.swift
@@ -82,10 +82,6 @@ import SwiftUI
   
   var followButtonViewModel: FollowButtonViewModel?
   
-  var isProAccount: Bool {
-    account?.url?.host() == "social-proxy.com"
-  }
-
   private(set) var account: Account?
   private var tabTask: Task<Void, Never>?
 
diff --git a/Packages/Models/Sources/Models/Account.swift b/Packages/Models/Sources/Models/Account.swift
index 7beedc64..d5b54679 100644
--- a/Packages/Models/Sources/Models/Account.swift
+++ b/Packages/Models/Sources/Models/Account.swift
@@ -71,6 +71,10 @@ public final class Account: Codable, Identifiable, Hashable, Sendable, Equatable
     header.lastPathComponent != "missing.png"
   }
   
+  public var isProAccount: Bool {
+    url?.host() == "social-proxy.com"
+  }
+  
   public var fullAccountName: String {
     "\(acct)@\(url?.host() ?? "")"
   }
diff --git a/Packages/StatusKit/Sources/StatusKit/Row/StatusRowViewModel.swift b/Packages/StatusKit/Sources/StatusKit/Row/StatusRowViewModel.swift
index 28d7afe7..1de04727 100644
--- a/Packages/StatusKit/Sources/StatusKit/Row/StatusRowViewModel.swift
+++ b/Packages/StatusKit/Sources/StatusKit/Row/StatusRowViewModel.swift
@@ -109,7 +109,7 @@ import SwiftUI
       theme.tintColor.opacity(0.15)
     } else if userMentionned {
       theme.secondaryBackgroundColor
-    } else if TipedUsers.shared.usersIds.contains(finalStatus.account.id) {
+    } else if status.account.isProAccount {
       .yellow.opacity(0.4)
     } else {
       theme.primaryBackgroundColor