Merge branch 'iOS-18' + fixes

This commit is contained in:
Thomas Ricouard 2024-08-07 21:13:58 +02:00
parent f02b4888bb
commit 57a6e36c76
2 changed files with 11 additions and 12 deletions

View file

@ -327,7 +327,7 @@ extension AccountDetailViewModel {
private func fetchPremiumAccount(fromAccount: Account, client: Client) async throws {
if fromAccount.isLinkedToPremiumAccount, let acct = fromAccount.premiumAcct {
let results: SearchResults? = try await client.get(endpoint: Search.search(query: acct,
type: "accounts",
type: .accounts,
offset: nil,
following: nil),
forceVersion: .v2)

View file

@ -95,21 +95,20 @@ struct PremiumAcccountSubsciptionSheetView: View {
Spacer()
if isSubscibeSelected {
HStack(alignment: .top) {
Text("Subscribe")
.font(.headline)
.fontWeight(.bold)
}
.transition(.push(from: .bottom))
.frame(height: 50)
.frame(maxWidth: .infinity)
.background(theme.tintColor.opacity(0.5))
.onTapGesture {
Button {
withAnimation {
state = .preparing
}
} label: {
Text("Subscribe")
.font(.headline)
.fontWeight(.bold)
.frame(maxWidth: .infinity)
.frame(height: 40)
}
.ignoresSafeArea()
.buttonStyle(.borderedProminent)
.padding(.horizontal, 16)
.padding(.bottom, 38)
}
}