From dbc9c1f9304fcc00b875c57c8545a618e13d7d78 Mon Sep 17 00:00:00 2001
From: Thomas Ricouard <ricouard77@gmail.com>
Date: Tue, 11 Jun 2024 21:38:24 +0200
Subject: [PATCH] Fixes

---
 .../Account/AccountDetailHeaderView.swift     |  4 ++--
 .../Sources/Account/Follow/FollowButton.swift |  7 +++---
 .../Sources/Account/Tip/TipSheetView.swift    | 23 ++++++++++---------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Packages/Account/Sources/Account/AccountDetailHeaderView.swift b/Packages/Account/Sources/Account/AccountDetailHeaderView.swift
index b99810b4..b2cfacb9 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 {
+          if viewModel.isProAccount && viewModel.relationship?.following == false {
             tipView
           }
         }
@@ -328,7 +328,7 @@ struct AccountDetailHeaderView: View {
         try? await viewModel.followButtonViewModel?.follow()
       }
     } label: {
-      Text("$ Send tip")
+      Text("$ Subscribe")
     }
     .buttonStyle(.bordered)
     .padding(.top, 8)
diff --git a/Packages/Account/Sources/Account/Follow/FollowButton.swift b/Packages/Account/Sources/Account/Follow/FollowButton.swift
index 8ec9b083..5494ccd4 100644
--- a/Packages/Account/Sources/Account/Follow/FollowButton.swift
+++ b/Packages/Account/Sources/Account/Follow/FollowButton.swift
@@ -30,8 +30,7 @@ import SwiftUI
   func follow() async throws {
     guard let client else { return }
     do {
-      _ = try await client.post(endpoint: Accounts.follow(id: accountId, notify: false, reblogs: true))
-      try await refreshRelationship()
+      relationship = try await client.post(endpoint: Accounts.follow(id: accountId, notify: false, reblogs: true))
       relationshipUpdated(relationship)
     } catch {
       throw error
@@ -41,8 +40,7 @@ import SwiftUI
   func unfollow() async throws {
     guard let client else { return }
     do {
-      _ = try await client.post(endpoint: Accounts.unfollow(id: accountId))
-      try await refreshRelationship()
+      relationship = try await client.post(endpoint: Accounts.unfollow(id: accountId))
       relationshipUpdated(relationship)
     } catch {
       throw error
@@ -54,6 +52,7 @@ import SwiftUI
     let relationships: [Relationship] = try await client.get(endpoint: Accounts.relationships(ids: [accountId]))
     if let relationship = relationships.first {
       self.relationship = relationship
+      relationshipUpdated(relationship)
     }
   }
 
diff --git a/Packages/Account/Sources/Account/Tip/TipSheetView.swift b/Packages/Account/Sources/Account/Tip/TipSheetView.swift
index 14267065..ffcb1ad9 100644
--- a/Packages/Account/Sources/Account/Tip/TipSheetView.swift
+++ b/Packages/Account/Sources/Account/Tip/TipSheetView.swift
@@ -7,14 +7,15 @@ import AppAccount
 
 @MainActor
 struct TipSheetView: View {
-  private let tips = ["$2.00", "$5.00", "$10.00", "$15.00", "$15.00", "$20.00", "$50.00"]
+  private let tips = [200, 500, 1000]
+  
   @Environment(\.dismiss) private var dismiss
   @Environment(Theme.self) private var theme: Theme
   @Environment(TipedUsers.self) private var tipedUSers: TipedUsers
   @Environment(\.openURL) private var openURL
   @Environment(AppAccountsManager.self) private var appAccount: AppAccountsManager
   
-  @State private var selectedTip: String?
+  @State private var selectedTip: Int?
   
   private enum TipState: Int, Equatable {
     case selection, sending, sent
@@ -57,16 +58,16 @@ struct TipSheetView: View {
       .padding(.top, 8)
     }
     VStack(alignment: .leading, spacing: 8) {
-      Text("Send a tip")
+      Text("Subscribe")
         .font(.title2)
-      Text("Send a tip to @\(account.username) to get access to exclusive content!")
+      Text("Subscribe to @\(account.username) to get access to exclusive content!")
       WrappingHStack(tips, id: \.self, spacing: .constant(12)) { tip in
         Button {
           withAnimation(.easeInOut(duration: 0.5)) {
             selectedTip = tip
           }
         } label: {
-          Text(tip)
+          Text((Double(tip) / 100.0).formatted(.currency(code: "USD").presentation(.narrow)))
         }
         .buttonStyle(.bordered)
         .padding(.vertical, 8)
@@ -80,9 +81,9 @@ struct TipSheetView: View {
     
     Spacer()
     
-    if let selectedTip {
+    if selectedTip != nil {
       HStack(alignment: .top) {
-        Text("Send \(selectedTip)")
+        Text("Subscribe")
           .font(.headline)
           .fontWeight(.bold)
       }
@@ -120,15 +121,15 @@ struct TipSheetView: View {
   
   private var sentView: some View {
     VStack(alignment: .center) {
-      Text("🎉🤑🎉")
-      Text("Thank for the tip!")
+      Text("Almost there...")
     }
     .font(.title)
     .fontWeight(.bold)
     .onAppear {
       DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-        if let accountName = appAccount.currentAccount.accountName,
-            let url = URL(string: "https://social-proxy.com/subscribe/to/\(account.username)?callback=icecubesapp://socialproxy&id=@\(accountName)") {
+        if let selectedTip,
+            let accountName = appAccount.currentAccount.accountName,
+            let url = URL(string: "https://social-proxy.com/subscribe/to/\(account.username)?callback=icecubesapp://socialproxy&id=@\(accountName)&amount=\(selectedTip)&currency=USD") {
           openURL(url)
         }
       }