Skip to content

Commit bc69dd5

Browse files
DenisDemyankoDenisDemyanko
committed
fix merge
1 parent 3b4bf88 commit bc69dd5

File tree

16 files changed

+157
-148
lines changed

16 files changed

+157
-148
lines changed

‎BeamWallet.xcodeproj/project.pbxproj

Lines changed: 84 additions & 68 deletions
Large diffs are not rendered by default.

‎BeamWallet/ViewControllers/Main/Wallet/Cells/WalletAvailableCell.swift

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,7 @@ class WalletAvailableCell: BaseCell {
9292
secondMaturingLabel.font = RegularFont(size: 14)
9393
secondAvailableLabel.font = RegularFont(size: 14)
9494
secondUnlinkLabel.font = RegularFont(size: 14)
95-
<<<<<<< HEAD
96-
=======
9795

98-
>>>>>>> beam_game
9996

10097
mainView.backgroundColor = UIColor.white.withAlphaComponent(0.05)
10198

@@ -299,9 +296,9 @@ extension WalletAvailableCell: Configurable {
299296
}
300297

301298
if let status = options.status {
302-
balanceLabel.text = String.currency(value: status.realAmount) + " BEAM"
303-
maturingLabel.text = String.currency(value: status.realMaturing) + " BEAM"
304-
unlinkLabel.text = String.currency(value: status.realShielded) + " BEAM"
299+
balanceLabel.text = String.currency(value: status.realAmount)
300+
maturingLabel.text = String.currency(value: status.realMaturing)
301+
unlinkLabel.text = String.currency(value: status.realShielded)
305302

306303
if status.realAmount == 0 {
307304
secondAvailableLabel.isHidden = true

‎BeamWallet/ViewControllers/Main/Wallet/Cells/WalletAvailableCell.xib

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<<<<<<< HEAD
3-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
4-
<device id="retina4_7" orientation="portrait" appearance="light"/>
5-
<dependencies>
6-
<deployment identifier="iOS"/>
7-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
8-
=======
92
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
103
<device id="retina4_7" orientation="portrait" appearance="light"/>
114
<dependencies>
125
<deployment identifier="iOS"/>
136
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
14-
>>>>>>> beam_game
157
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
168
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
179
</dependencies>

‎BeamWallet/ViewControllers/Main/Wallet/Cells/WalletProgressCell.swift

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ class WalletProgressCell: BaseCell {
4141
@IBOutlet weak private var sentStack: UIStackView!
4242
@IBOutlet weak private var mainStackView: UIStackView!
4343

44+
@IBOutlet weak private var currencyReceivingIcon: UIImageView!
45+
@IBOutlet weak private var currencySendingIcon: UIImageView!
46+
4447
@IBOutlet weak private var mainButton: UIButton!
4548

4649
@IBOutlet weak private var secondSendLabel: UILabel!
@@ -70,6 +73,14 @@ class WalletProgressCell: BaseCell {
7073

7174
mainButton.setBackgroundImage(UIImage.fromColor(color: UIColor.black.withAlphaComponent(0.3)), for: .highlighted)
7275

76+
currencyReceivingIcon.image = IconSymbolBeam()?.withRenderingMode(.alwaysTemplate)
77+
currencyReceivingIcon.tintColor = receivingLabel.textColor
78+
currencyReceivingIcon.tintAdjustmentMode = .normal
79+
80+
currencySendingIcon.image = IconSymbolBeam()?.withRenderingMode(.alwaysTemplate)
81+
currencySendingIcon.tintColor = sentLabel.textColor
82+
currencySendingIcon.tintAdjustmentMode = .normal
83+
7384
mainView.backgroundColor = UIColor.white.withAlphaComponent(0.05)
7485

7586
titleLabel.text = Localizable.shared.strings.in_progress.uppercased()
@@ -99,8 +110,8 @@ extension WalletProgressCell: Configurable {
99110

100111
func configure(with options: (expand: Bool, status:BMWalletStatus?)) {
101112
if let status = options.status {
102-
receivingLabel.text = "+ " + String.currency(value: status.realReceiving) + " BEAM"
103-
sentLabel.text = "- " + String.currency(value: status.realSending) + " BEAM"
113+
receivingLabel.text = "+ " + String.currency(value: status.realReceiving)
114+
sentLabel.text = "- " + String.currency(value: status.realSending)
104115

105116
let secondReceive = AppModel.sharedManager().exchangeValue(status.realReceiving)
106117
let secondSent = AppModel.sharedManager().exchangeValue(status.realSending)

‎BeamWallet/ViewControllers/Main/Wallet/Cells/WalletProgressCell.xib

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina4_7" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>
@@ -39,7 +39,7 @@
3939
</connections>
4040
</button>
4141
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="In progress" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TlK-Sl-djr">
42-
<rect key="frame" x="15" y="15" width="71.5" height="17"/>
42+
<rect key="frame" x="15" y="15" width="70.5" height="16.5"/>
4343
<fontDescription key="fontDescription" name="SFProDisplay-Bold" family="SF Pro Display" pointSize="14"/>
4444
<color key="textColor" red="0.55294117649999996" green="0.63137254899999995" blue="0.67843137249999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
4545
<nil key="highlightedColor"/>
@@ -52,7 +52,7 @@
5252
</userDefinedRuntimeAttributes>
5353
</label>
5454
<stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="LQy-uL-llp">
55-
<rect key="frame" x="15" y="52" width="270" height="115"/>
55+
<rect key="frame" x="15" y="51.5" width="270" height="115"/>
5656
<subviews>
5757
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="lgf-Cy-nCD">
5858
<rect key="frame" x="0.0" y="0.0" width="270" height="55"/>
@@ -83,26 +83,23 @@
8383
<rect key="frame" x="32" y="0.0" width="16.5" height="55"/>
8484
<subviews>
8585
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Mp8-tI-hcy">
86-
<rect key="frame" x="0.0" y="0.0" width="29.5" height="30"/>
86+
<rect key="frame" x="0.0" y="0.0" width="28" height="30"/>
8787
<constraints>
8888
<constraint firstAttribute="height" constant="30" id="leH-hU-LVw"/>
8989
</constraints>
9090
<fontDescription key="fontDescription" name="SFProDisplay-Regular" family="SF Pro Display" pointSize="24"/>
9191
<color key="textColor" red="0.85490196080000003" green="0.40784313729999999" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
9292
<nil key="highlightedColor"/>
9393
</label>
94-
<<<<<<< HEAD
95-
=======
9694
<imageView userInteractionEnabled="NO" alpha="0.0" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="iconSymbol" translatesAutoresizingMaskIntoConstraints="NO" id="Ccv-X7-xeS">
9795
<rect key="frame" x="32" y="6.5" width="14" height="21"/>
9896
<constraints>
9997
<constraint firstAttribute="width" constant="14" id="0Vl-da-CKA"/>
10098
<constraint firstAttribute="height" constant="21" id="HaA-Of-UoT"/>
10199
</constraints>
102100
</imageView>
103-
>>>>>>> beam_game
104101
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+2 USD" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BcS-EM-zM9">
105-
<rect key="frame" x="2" y="33" width="46" height="17"/>
102+
<rect key="frame" x="2" y="33" width="49.5" height="17"/>
106103
<fontDescription key="fontDescription" name="SFProDisplay-Light" family="SF Pro Display" pointSize="14"/>
107104
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
108105
<nil key="highlightedColor"/>
@@ -111,7 +108,9 @@
111108
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
112109
<constraints>
113110
<constraint firstItem="Mp8-tI-hcy" firstAttribute="leading" secondItem="nZD-ff-GLJ" secondAttribute="leading" id="4n4-Iz-HNn"/>
111+
<constraint firstItem="Ccv-X7-xeS" firstAttribute="centerY" secondItem="Mp8-tI-hcy" secondAttribute="centerY" constant="2" id="KvK-ck-On0"/>
114112
<constraint firstItem="Mp8-tI-hcy" firstAttribute="top" secondItem="nZD-ff-GLJ" secondAttribute="top" id="QpE-3L-2FS"/>
113+
<constraint firstItem="Ccv-X7-xeS" firstAttribute="leading" secondItem="Mp8-tI-hcy" secondAttribute="trailing" constant="4" id="nXJ-li-TPK"/>
115114
<constraint firstItem="BcS-EM-zM9" firstAttribute="leading" secondItem="nZD-ff-GLJ" secondAttribute="leading" constant="2" id="q5F-SB-niu"/>
116115
<constraint firstAttribute="bottom" secondItem="BcS-EM-zM9" secondAttribute="bottom" constant="5" id="scR-mw-WRc"/>
117116
<constraint firstItem="BcS-EM-zM9" firstAttribute="top" secondItem="Mp8-tI-hcy" secondAttribute="bottom" constant="3" id="vSy-P0-UWk"/>
@@ -150,26 +149,23 @@
150149
<rect key="frame" x="32" y="0.0" width="16.5" height="55"/>
151150
<subviews>
152151
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="4zo-QS-DQR">
153-
<rect key="frame" x="0.0" y="0.0" width="29.5" height="30"/>
152+
<rect key="frame" x="0.0" y="0.0" width="28" height="30"/>
154153
<constraints>
155154
<constraint firstAttribute="height" constant="30" id="PFu-LP-VMa"/>
156155
</constraints>
157156
<fontDescription key="fontDescription" name="SFProDisplay-Regular" family="SF Pro Display" pointSize="24"/>
158157
<color key="textColor" red="0.043137254899999998" green="0.80000000000000004" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
159158
<nil key="highlightedColor"/>
160159
</label>
161-
<<<<<<< HEAD
162-
=======
163160
<imageView userInteractionEnabled="NO" alpha="0.0" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="iconSymbol" translatesAutoresizingMaskIntoConstraints="NO" id="KAF-xz-dMa">
164161
<rect key="frame" x="32" y="6.5" width="14" height="21"/>
165162
<constraints>
166163
<constraint firstAttribute="width" constant="14" id="30A-56-uCA"/>
167164
<constraint firstAttribute="height" constant="21" id="MLc-bi-AK4"/>
168165
</constraints>
169166
</imageView>
170-
>>>>>>> beam_game
171167
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+2 USD" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NJb-XI-LGz">
172-
<rect key="frame" x="2" y="33" width="46" height="17"/>
168+
<rect key="frame" x="2" y="33" width="49.5" height="17"/>
173169
<fontDescription key="fontDescription" name="SFProDisplay-Light" family="SF Pro Display" pointSize="14"/>
174170
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
175171
<nil key="highlightedColor"/>
@@ -178,8 +174,10 @@
178174
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
179175
<constraints>
180176
<constraint firstItem="4zo-QS-DQR" firstAttribute="top" secondItem="65s-hh-wsy" secondAttribute="top" id="2HN-rq-taj"/>
177+
<constraint firstItem="KAF-xz-dMa" firstAttribute="leading" secondItem="4zo-QS-DQR" secondAttribute="trailing" constant="4" id="3vU-C8-fpK"/>
181178
<constraint firstItem="NJb-XI-LGz" firstAttribute="leading" secondItem="65s-hh-wsy" secondAttribute="leading" constant="2" id="TJZ-k9-in1"/>
182179
<constraint firstAttribute="bottom" secondItem="NJb-XI-LGz" secondAttribute="bottom" constant="5" id="Ufi-m8-am5"/>
180+
<constraint firstItem="KAF-xz-dMa" firstAttribute="centerY" secondItem="4zo-QS-DQR" secondAttribute="centerY" constant="2" id="fCl-Nu-qPF"/>
183181
<constraint firstItem="NJb-XI-LGz" firstAttribute="top" secondItem="4zo-QS-DQR" secondAttribute="bottom" constant="3" id="tuO-W4-guG"/>
184182
<constraint firstItem="4zo-QS-DQR" firstAttribute="leading" secondItem="65s-hh-wsy" secondAttribute="leading" id="zI4-Kl-SoZ"/>
185183
</constraints>
@@ -230,6 +228,8 @@
230228
<viewLayoutGuide key="safeArea" id="FbY-f8-F2B"/>
231229
<connections>
232230
<outlet property="arrowIcon" destination="kO2-nM-Mbs" id="0Ez-HM-jB6"/>
231+
<outlet property="currencyReceivingIcon" destination="KAF-xz-dMa" id="erg-ci-M7a"/>
232+
<outlet property="currencySendingIcon" destination="Ccv-X7-xeS" id="3O8-mm-q1G"/>
233233
<outlet property="mainButton" destination="NHf-s5-cUd" id="rkb-6D-STW"/>
234234
<outlet property="mainStackView" destination="LQy-uL-llp" id="hcg-rd-H1X"/>
235235
<outlet property="mainView" destination="Mdh-nY-eDo" id="yrE-uQ-ayL"/>
@@ -248,5 +248,6 @@
248248
<image name="icon-received" width="22" height="22"/>
249249
<image name="icon-sent" width="22" height="22"/>
250250
<image name="iconDownArrow" width="13" height="8"/>
251+
<image name="iconSymbol" width="16" height="24.5"/>
251252
</resources>
252253
</document>

‎Resources/es.lproj/Localizable.strings

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
"faucet_text" = "¿Quieres ver la wallet en acción? Obtén una pequeña cantidad de Beams del grifo de la comunidad.";
453453
=======
454454
"faucet_text" = "Vea la wallet en acción. Obtenga una pequeña cantidad de Beams del grifo de la comunidad.";
455-
>>>>>>> sprint_4
455+
456456
"faucet_ok" = "Sí, por favor";
457457
"faucet_no" = "No, estoy bien";
458458
"show_seed_phrase" = "Mostrar frase semilla";
@@ -465,7 +465,7 @@
465465
"make_wallet_secure_text" = "Por favor, aumente la seguridad de la wallet guardando su frase semilla para que no pierda sus fondos.";
466466
=======
467467
"make_wallet_secure_text" = "Escribe y valida tu frase semilla para que siempre puedas recuperar tus fondos.";
468-
>>>>>>> sprint_4
468+
469469
"complete_verification" = "Verificación completa";
470470
"yes_please" = "sí, por favor";
471471
"i_will_later" = "lo haré más tarde";
@@ -493,8 +493,7 @@
493493
"paste" = "Pegar";
494494
"status" = "Estado"; // transaction status
495495
"remove_wallet" = "Eliminar wallet";
496-
<<<<<<< HEAD
497-
=======
496+
498497
"export_wallet_data" = "Exportar datos del wallet";
499498
"import_wallet_data" = "Importar datos del wallet";
500499
"utilities" = "Utilidades";
@@ -510,4 +509,4 @@
510509
"block_height" = "block height";
511510
"dark_mode" = "Dark mode";
512511
"delete_all_tags" = "Delete all tags";
513-
>>>>>>> sprint_4
512+

0 commit comments

Comments
 (0)