Skip to content

Commit 46c1353

Browse files
committed
Avoid adding tokenUid to URI for bitcoin and bitcoinCash typed tokens (derived and addressType)
1 parent 73628c9 commit 46c1353

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Receive/Address/ReceiveAddressView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct ReceiveAddressView<Service: IReceiveAddressService, Factory: IReceiveAddr
4343

4444
Spacer().frame(height: 52)
4545

46-
LazyVGrid(columns: viewModel.actions.map { _ in GridItem(.flexible()) }, spacing: .margin16) {
46+
LazyVGrid(columns: viewModel.actions.map { _ in GridItem(.flexible(), alignment: .top) }, spacing: .margin16) {
4747
ForEach(viewModel.actions, id: \.self) { action in
4848
actionView(type: action)
4949
}

UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Receive/Address/ReceiveAddressViewItemFactory.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ class ReceiveAddressViewItemFactory: IReceiveAddressViewItemFactory {
3232

3333
addressUri.parameters[AddressUri.Field.amountField(blockchainType: item.token.blockchainType)] = amount
3434
addressUri.parameters[.blockchainUid] = item.token.blockchainType.uid
35-
addressUri.parameters[.tokenUid] = item.token.type.id
35+
switch item.token.type {
36+
case .addressType, .derived: ()
37+
default: addressUri.parameters[.tokenUid] = item.token.type.id
38+
}
3639

3740
uri = parser.uri(addressUri)
3841
}

0 commit comments

Comments
 (0)