gh-2672 Hide redeem deadline warning if allocation was redeemed

safe-global · Sep 15, 2022 · 586a705 · 586a705
1 parent 2a0d57c
commit 586a705
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Multisig/UI/ClaimToken/ClaimingAmountViewController/ClaimTokensViewController.swift b/Multisig/UI/ClaimToken/ClaimingAmountViewController/ClaimTokensViewController.swift
@@ -365,6 +365,7 @@ extension ClaimTokensViewController: UITableViewDelegate, UITableViewDataSource
                 inputAmount = cell.value
                 claimButton.isEnabled = (error == nil) && claimButtonEnabled
             }
+            cell.redeemDeadlineWarning = !data.isRedeemed
             return cell
 
         case .selectedDelegate:
@@ -384,6 +385,8 @@ extension ClaimTokensViewController: UITableViewDelegate, UITableViewDataSource
 
         var totalValue: String
         var availableRange: Range<Sol.UInt128>
+
+        var isRedeemed: Bool
     }
 
     func displayValues(from claimData: ClaimingAppController.ClaimingData) -> DisplayValues {
@@ -409,6 +412,8 @@ extension ClaimTokensViewController: UITableViewDelegate, UITableViewDataSource
             )
         }
 
+        let isRedeemed = claimData.isRedeemed
+
         // components and total of vested amount
         let userVestedAmount: Sol.UInt128? = claimData.availableAmount(for: userAllocation, at: timestamp)
         let ecoVestedAmount: Sol.UInt128? = claimData.availableAmount(for: ecosystemAllocation, at: timestamp)
@@ -486,7 +491,8 @@ extension ClaimTokensViewController: UITableViewDelegate, UITableViewDataSource
             unvestedAmountTooltip: unvestedAmountTooltip,
             unvestedStyle: lightBoxStyle,
             totalValue: allocationText,
-            availableRange: availableRange
+            availableRange: availableRange,
+            isRedeemed: isRedeemed
         )
     }
 

diff --git a/Multisig/UI/ClaimToken/ClaimingAmountViewController/ClaimedAmountInputCell.swift b/Multisig/UI/ClaimToken/ClaimingAmountViewController/ClaimedAmountInputCell.swift
@@ -38,6 +38,11 @@ class ClaimedAmountInputCell: UITableViewCell {
         fieldDelegate.isUsingMaxValue
     }
 
+    var redeemDeadlineWarning: Bool {
+        get { !redeemWarningLabel.isHidden }
+        set { redeemWarningLabel.isHidden = !newValue }
+    }
+
     override func awakeFromNib() {
         super.awakeFromNib()
         titleLabel.text = "How much do you want to claim?"