Skip to content

Commit d49b664

Browse files
committed
Show send selector after scan qr-address.
Fix parsing amounts with ',' as separator.
1 parent 787d8f5 commit d49b664

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

UnstoppableWallet/UnstoppableWallet/Modules/Main/Workers/SendAppShowWorker/AddressAppShowModule.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ extension AddressAppShowModule: IEventHandler {
103103
}
104104
var uri = AddressUri(scheme: "")
105105
uri.address = text
106-
return
106+
showSendTokenList(source: source, eventType: eventType, uri: uri, allowedBlockchainTypes: types)
107107
}
108108
}
109109
}

UnstoppableWallet/UnstoppableWallet/Modules/MultiSwap/MultiSwapViewModel.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class MultiSwapViewModel: ObservableObject {
2121
private let marketKit = App.shared.marketKit
2222
private let walletManager = App.shared.walletManager
2323
private let adapterManager = App.shared.adapterManager
24+
private let decimalParser = AmountDecimalParser()
2425

2526
@Published var currency: Currency
2627

@@ -170,7 +171,7 @@ class MultiSwapViewModel: ObservableObject {
170171
syncQuotes()
171172
syncFiatAmountIn()
172173

173-
let amount = Decimal(string: amountString)
174+
let amount = decimalParser.parseAnyDecimal(from: amountString)
174175

175176
if amount != amountIn {
176177
amountString = amountIn?.description ?? ""
@@ -180,7 +181,7 @@ class MultiSwapViewModel: ObservableObject {
180181

181182
@Published var amountString: String = "" {
182183
didSet {
183-
let amount = Decimal(string: amountString)
184+
let amount = decimalParser.parseAnyDecimal(from: amountString)
184185

185186
guard amount != amountIn else {
186187
return
@@ -196,7 +197,7 @@ class MultiSwapViewModel: ObservableObject {
196197
didSet {
197198
syncAmountIn()
198199

199-
let amount = Decimal(string: fiatAmountString)?.rounded(decimal: 2)
200+
let amount = decimalParser.parseAnyDecimal(from: fiatAmountString)?.rounded(decimal: 2)
200201

201202
if amount != fiatAmountIn {
202203
fiatAmountString = fiatAmountIn?.description ?? ""
@@ -206,7 +207,7 @@ class MultiSwapViewModel: ObservableObject {
206207

207208
@Published var fiatAmountString: String = "" {
208209
didSet {
209-
let amount = Decimal(string: fiatAmountString)?.rounded(decimal: 2)
210+
let amount = decimalParser.parseAnyDecimal(from: fiatAmountString)?.rounded(decimal: 2)
210211

211212
guard amount != fiatAmountIn else {
212213
return

UnstoppableWallet/UnstoppableWallet/Modules/SendNew/PreSendViewModel.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ class PreSendViewModel: ObservableObject {
99
private let marketKit = App.shared.marketKit
1010
private let walletManager = App.shared.walletManager
1111
private let adapterManager = App.shared.adapterManager
12+
private let decimalParser = AmountDecimalParser()
1213

1314
private var cancellables = Set<AnyCancellable>()
1415

@@ -19,7 +20,7 @@ class PreSendViewModel: ObservableObject {
1920
syncFiatAmount()
2021
syncSendData()
2122

22-
let amount = Decimal(string: amountString)
23+
let amount = decimalParser.parseAnyDecimal(from: amountString)
2324

2425
if amount != self.amount {
2526
amountString = self.amount?.description ?? ""
@@ -29,7 +30,7 @@ class PreSendViewModel: ObservableObject {
2930

3031
@Published var amountString: String = "" {
3132
didSet {
32-
var amount = Decimal(string: amountString)
33+
var amount = decimalParser.parseAnyDecimal(from: amountString)
3334

3435
if amount == 0 {
3536
amount = nil
@@ -49,7 +50,7 @@ class PreSendViewModel: ObservableObject {
4950
didSet {
5051
syncAmount()
5152

52-
let amount = Decimal(string: fiatAmountString)?.rounded(decimal: 2)
53+
let amount = decimalParser.parseAnyDecimal(from: fiatAmountString)?.rounded(decimal: 2)
5354

5455
if amount != fiatAmount {
5556
fiatAmountString = fiatAmount?.description ?? ""
@@ -59,7 +60,7 @@ class PreSendViewModel: ObservableObject {
5960

6061
@Published var fiatAmountString: String = "" {
6162
didSet {
62-
let amount = Decimal(string: fiatAmountString)?.rounded(decimal: 2)
63+
let amount = decimalParser.parseAnyDecimal(from: fiatAmountString)?.rounded(decimal: 2)
6364

6465
guard amount != fiatAmount else {
6566
return

0 commit comments

Comments
 (0)