Skip to content

Commit

Permalink
Merge branch 'feature/pre_beta' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonmcl
simonmcl committed May 2, 2024
2 parents 6ad81ef + 0351bb2 commit 3207915
Show file tree
Hide file tree
Showing 29 changed files with 301 additions and 443 deletions.
22 changes: 22 additions & 0 deletions Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Fee.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Fee.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Fee.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Gas.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Gas.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Gas.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Storage.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Storage.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Kukai Mobile/Assets.xcassets/Icons/Misc/Fee_Storage.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
74 changes: 61 additions & 13 deletions Kukai Mobile/Modules/Account/Account.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
Expand Down Expand Up @@ -272,7 +273,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="&lt;balance&gt;" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sSc-km-vdB">
<rect key="frame" x="112" y="2" width="257" height="24"/>
<rect key="frame" x="98" y="2" width="271" height="24"/>
<fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
<color key="textColor" name="Txt2"/>
<nil key="highlightedColor"/>
Expand All @@ -284,7 +285,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cTx-cl-SFJ" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
<rect key="frame" x="16" y="4" width="80" height="20"/>
<rect key="frame" x="16" y="-2" width="66" height="32"/>
<fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="16"/>
<color key="tintColor" name="Txt10"/>
<inset key="imageEdgeInsets" minX="17" minY="0.0" maxX="4" maxY="0.0"/>
Expand Down Expand Up @@ -880,6 +881,7 @@
<segue destination="PJu-ck-fWS" kind="show" identifier="details" id="zcN-zW-iIF"/>
<segue destination="afZ-no-uZ1" kind="show" identifier="recover" id="lv2-Xs-Dwb"/>
<segue destination="gR5-I4-y5S" kind="show" identifier="onramp" id="cfv-eY-Nia"/>
<segue destination="LdT-JN-wgl" kind="custom" identifier="total-estimated-info" customClass="BottomSheetMediumSegue" customModule="Kukai_Mobile" customModuleProvider="target" id="1e7-qw-UYx"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="SsA-5r-8s8" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
Expand All @@ -904,7 +906,7 @@
</viewControllerPlaceholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="FWf-TM-nq9" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-2592" y="-1420"/>
<point key="canvasLocation" x="-2592" y="-1527"/>
</scene>
<!--Hidden Tokens-->
<scene sceneID="Qrr-xS-5hQ">
Expand Down Expand Up @@ -992,7 +994,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="insetGrouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" estimatedSectionHeaderHeight="-1" sectionFooterHeight="18" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="oRe-e5-5oV">
<rect key="frame" x="0.0" y="103" width="393" height="749"/>
<rect key="frame" x="0.0" y="127" width="393" height="725"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="separatorColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<prototypes>
Expand Down Expand Up @@ -1133,7 +1135,7 @@
<constraints>
<constraint firstItem="oRe-e5-5oV" firstAttribute="leading" secondItem="jsv-DB-BSC" secondAttribute="leading" id="2cj-6M-ymd"/>
<constraint firstItem="oRe-e5-5oV" firstAttribute="trailing" secondItem="jsv-DB-BSC" secondAttribute="trailing" id="KcU-sP-ubU"/>
<constraint firstItem="oRe-e5-5oV" firstAttribute="top" secondItem="jsv-DB-BSC" secondAttribute="top" id="MUm-Cl-hLC"/>
<constraint firstItem="oRe-e5-5oV" firstAttribute="top" secondItem="jsv-DB-BSC" secondAttribute="top" constant="24" id="MUm-Cl-hLC"/>
<constraint firstAttribute="bottom" secondItem="oRe-e5-5oV" secondAttribute="bottom" id="WXa-Ak-Mae"/>
</constraints>
</view>
Expand Down Expand Up @@ -1725,15 +1727,18 @@
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Staking Info" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WTz-3P-7LT">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Delegate Rewards" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WTz-3P-7LT">
<rect key="frame" x="16" y="83" width="361" height="24"/>
<fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
<color key="textColor" name="Txt2"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Under Construction" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OJY-ci-65Q">
<rect key="frame" x="16" y="131" width="361" height="19.333333333333343"/>
<fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OJY-ci-65Q">
<rect key="frame" x="16" y="131" width="361" height="101"/>
<string key="text">Whenever you make a change to your selected baker, there is a ~20 day delay until the new baker begins to send you rewards. During that time you will continue to receive rewards from your previous baker.

Rewards are typically paid out every ~3 days.</string>
<fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
<color key="textColor" name="Txt2"/>
<nil key="highlightedColor"/>
</label>
Expand Down Expand Up @@ -1774,6 +1779,46 @@
</objects>
<point key="canvasLocation" x="-2782" y="-495"/>
</scene>
<!--Fee Info View Controller-->
<scene sceneID="YVw-vf-N1y">
<objects>
<viewController storyboardIdentifier="create-wallet-info1" id="LdT-JN-wgl" customClass="FeeInfoViewController" customModule="Kukai_Mobile" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="9Um-gH-IIX">
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Total Estimated Value" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bUg-yg-MMA">
<rect key="frame" x="16" y="89" width="361" height="24"/>
<fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
<color key="textColor" name="Txt2"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DGj-qV-Va3">
<rect key="frame" x="32" y="137" width="329" height="117.66666666666669"/>
<string key="text">The estimated value only includes tokens you hold that have an exchange rate priced in either XTZ or your selected currency.

The estimate uses exchange data that might not be up to date and does not take into account selling costs.</string>
<fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
<color key="textColor" name="Txt6"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<viewLayoutGuide key="safeArea" id="6NG-9B-vES"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="6NG-9B-vES" firstAttribute="trailing" secondItem="bUg-yg-MMA" secondAttribute="trailing" constant="16" id="1nb-FS-LtP"/>
<constraint firstItem="DGj-qV-Va3" firstAttribute="leading" secondItem="6NG-9B-vES" secondAttribute="leading" constant="32" id="JAr-m2-1c3"/>
<constraint firstItem="6NG-9B-vES" firstAttribute="trailing" secondItem="DGj-qV-Va3" secondAttribute="trailing" constant="32" id="V2n-cA-Mdp"/>
<constraint firstItem="bUg-yg-MMA" firstAttribute="top" secondItem="6NG-9B-vES" secondAttribute="top" constant="30" id="bMb-ep-seH"/>
<constraint firstItem="bUg-yg-MMA" firstAttribute="leading" secondItem="6NG-9B-vES" secondAttribute="leading" constant="16" id="n1f-Q9-yJC"/>
<constraint firstItem="DGj-qV-Va3" firstAttribute="top" secondItem="bUg-yg-MMA" secondAttribute="bottom" constant="24" id="wZm-DN-Ho1"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="TT3-wq-V65" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-1793" y="-1420"/>
</scene>
</scenes>
<designables>
<designable name="1Ao-zL-OIA">
Expand All @@ -1783,10 +1828,10 @@
<size key="intrinsicContentSize" width="78" height="31"/>
</designable>
<designable name="405-zw-M1R">
<size key="intrinsicContentSize" width="26" height="26"/>
<size key="intrinsicContentSize" width="30" height="34"/>
</designable>
<designable name="5Pu-Vc-J65">
<size key="intrinsicContentSize" width="54" height="44"/>
<size key="intrinsicContentSize" width="24" height="14"/>
</designable>
<designable name="EKG-xY-HYO">
<size key="intrinsicContentSize" width="73" height="34"/>
Expand All @@ -1795,10 +1840,10 @@
<size key="intrinsicContentSize" width="117" height="34"/>
</designable>
<designable name="cTx-cl-SFJ">
<size key="intrinsicContentSize" width="80" height="20"/>
<size key="intrinsicContentSize" width="66" height="32"/>
</designable>
<designable name="dQs-Hg-Uq3">
<size key="intrinsicContentSize" width="56" height="46"/>
<size key="intrinsicContentSize" width="24" height="14"/>
</designable>
<designable name="mc4-MV-VSh">
<size key="intrinsicContentSize" width="83.333333333333329" height="31"/>
Expand Down Expand Up @@ -1884,5 +1929,8 @@
<namedColor name="TxtGood4">
<color red="0.035000000149011612" green="0.68199998140335083" blue="0.29399999976158142" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
2 changes: 1 addition & 1 deletion Kukai Mobile/Modules/Account/AccountViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class AccountViewController: UIViewController, UITableViewDelegate, EstimatedTot
}

func totalEstiamtedInfoTapped() {
self.alert(withTitle: "Total Estimated", andMessage: "Info Text")
self.performSegue(withIdentifier: "total-estimated-info", sender: nil)
}
}

Expand Down
5 changes: 3 additions & 2 deletions Kukai Mobile/Modules/Account/TokenDetailsViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ class TokenDetailsViewController: UIViewController, UITableViewDelegate {
let address = DependencyManager.shared.selectedWalletAddress ?? ""
if TokenStateService.shared.removeHidden(forAddress: address, token: token) {
DependencyManager.shared.balanceService.updateTokenStates(forAddress: address, selectedAccount: true)
self?.dismiss(animated: true)
self?.navigationController?.popViewController(animated: true)

} else {
self?.windowError(withTitle: "error".localized(), description: "error-unhide-token".localized())
}
Expand All @@ -166,7 +167,7 @@ class TokenDetailsViewController: UIViewController, UITableViewDelegate {
let address = DependencyManager.shared.selectedWalletAddress ?? ""
if TokenStateService.shared.addHidden(forAddress: address, token: token) {
DependencyManager.shared.balanceService.updateTokenStates(forAddress: address, selectedAccount: true)
self?.dismiss(animated: true)
self?.navigationController?.popViewController(animated: true)

} else {
self?.windowError(withTitle: "error".localized(), description: "error-hide-token".localized())
Expand Down
Loading

0 comments on commit 3207915

Please sign in to comment.