Skip to content

Commit

Permalink
Merge tag '2.6.4' into develop
Browse files Browse the repository at this point in the history
# -----BEGIN SSH SIGNATURE-----
# U1NIU0lHAAAAAQAAAhcAAAAHc3NoLXJzYQAAAAMBAAEAAAIBAKgu9N6lXOixsGNEmzxZhA
# Rc8ABi3MlOHGT30s3zCQEtvbE/j1QXRycgru5n/TZPKiEqZz5OGLM7FG3lNqHTjrQG1jfZ
# rH9JfmTRX9kLWyDmsiKJkB0L19NcCJQKwhkAdcJkbhQHP4bk1o3uMS+M89n6Y0nmUocGrk
# j7yX/79iQn7PQXdDRk7I+p0p1hCMC7fRlhxPwBX8iPOoty9L75ZoteRoWMGoq4T2fhDdUd
# 5ASRKfdVDjUnFrYvI+o8mhXdbzxNLjp5oN9VWQsb+YIkzApcI1+42BT5WABk+3cLlheqPR
# SocNgYdoZZPA1x6Zlzy2gggm33m/uU7gww2iATphdoyXoj1Nv9loMDOaCQUe6s7Fnnn+xH
# hC1fJoCRlrWJ2QjQmZj18KkrXp2/ZNfvLYUIoQVONF40iizb5GJewH00m1ZV+/oAqbJ/W1
# nfLmXJ/ShwACe3hyZFVOaB2582UyTDFCFJL2Bgbiw8y1ayS15+gs9TkFJlAtbpwofPqVB2
# 16iiE8ViFf//J5ommM1S2sHXaPvu1D038OScIGnz0grhnCjzBr3BduW7EYQ6RhVOqMaEUy
# mQiRKIAtfj+6eHgk3IxB3ynReUFQqE3wreE9buA0vrCO4aWEet+qJsg+395K+/l7E6LQOg
# 5rkgcVj9rtFeo4gFBT2AUUSLmHaqpfABAAAAA2dpdAAAAAAAAAAGc2hhNTEyAAACFAAAAA
# xyc2Etc2hhMi0yNTYAAAIAYc5K4Fv+RYahUxbWJlyopGA3okG+OLN7bDFf9AUVgUXiarci
# EgfOebVI8qz5Oo1kQDTsbNr08Nv+oycGFWhQ4vH/hnNB/tPCYWsxJqH7VxvU0a5lz2Sa++
# q+Es7h1WOtQWP+3KwT7Nret8vnAqt5CjmGMYzsmtjN4lF2QZuOnIX4k/8wcx6n0NIyJ/cD
# VxAcU4Zfeys2bqwcLiVOv7Kz6lPyxeA8auJ9KOx34E/JxN5HFUiRwYAz10Ps7a6ILbv1bn
# 3YLHx4o0dAXQLOr56HsCKfXZtMsArVBJoeTh50w+fhz+rKJiDN36EnG6/Dm6KNYqc/Tjx6
# ZhtqLUd0OzPy1Asf331TPZsIWPXTSVxe3k/HyEIe00lo+mqVXFv90HLDFrNflqZUtVZx8m
# ulT70oWAt9ch5v59RKZZVbyjHGXPIFywRiGvf/sKce9Z/fdnApJAVdOHFsChe+d1+9lBUx
# A7M9VSdAKU1x1Z+tO0D0Si+rqrlaaFSqfBeJrHGlPq111oCqAYxcpKOG8xLGJV5pboOEn4
# 0Y4TyUPeI7JGkHh4IMB7V6DP7s2uoYrAMnNfzNFZRLKWy38mNViQp0zRJkEInokagctPF6
# m3UoMzsqYMHiam42//TgAzJiVKm+UdjYNy+jZ89ZvdDH2GADFrcks/HPUkQPS+c9mjKdht
# kMU2w=
# -----END SSH SIGNATURE-----
# gpg verification failed.
  • Loading branch information
tobihagemann committed Nov 30, 2024
2 parents ca2d2cb + c7b8b2c commit d78c937
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion Cryptomator/Purchase/PurchaseViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,12 @@ class PurchaseViewModel: BaseIAPViewModel, ProductFetching {

private func addLifetimeLicenseItem() {
if let product = products[.fullVersion], let localizedPrice = product.localizedPrice {
// Temporarily added for December 2024 Sale
let currentYear = Calendar.current.component(.year, from: Date())
let currentMonth = Calendar.current.component(.month, from: Date())
let productDetail = currentYear == 2024 && currentMonth == 12 ? "🎁 33%* off in December" : nil
let viewModel = PurchaseCellViewModel(productName: LocalizedString.getValue("purchase.product.lifetimeLicense"),
productDetail: "🎁 33%* off in December",
productDetail: productDetail,
price: localizedPrice,
purchaseDetail: LocalizedString.getValue("purchase.product.lifetimeLicense.duration"),
productIdentifier: .fullVersion)
Expand Down
2 changes: 1 addition & 1 deletion CryptomatorTests/Purchase/PurchaseViewModelTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ class PurchaseViewModelTests: IAPViewModelTestCase {

private var lifetimeLicenseCell: Item {
return .purchaseCell(.init(productName: LocalizedString.getValue("purchase.product.lifetimeLicense"),
productDetail: "🎁 33%* off in December",
productDetail: nil,
price: "$11.99",
purchaseDetail: LocalizedString.getValue("purchase.product.lifetimeLicense.duration"),
productIdentifier: .fullVersion))
Expand Down

0 comments on commit d78c937

Please sign in to comment.