Avoid adding tokenUid to URI for bitcoin and bitcoinCash typed tokens…

… (derived and addressType)
horizontalsystems · Dec 25, 2023 · 46c1353 · 46c1353
1 parent 73628c9
commit 46c1353
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Receive/Address/ReceiveAddressView.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Wallet/Receive/Address/ReceiveAddressView.swift
@@ -43,7 +43,7 @@ struct ReceiveAddressView<Service: IReceiveAddressService, Factory: IReceiveAddr
 
                 Spacer().frame(height: 52)
 
-                LazyVGrid(columns: viewModel.actions.map { _ in GridItem(.flexible()) }, spacing: .margin16) {
+                LazyVGrid(columns: viewModel.actions.map { _ in GridItem(.flexible(), alignment: .top) }, spacing: .margin16) {
                     ForEach(viewModel.actions, id: \.self) { action in
                         actionView(type: action)
                     }

diff --git a/...llet/UnstoppableWallet/Modules/Wallet/Receive/Address/ReceiveAddressViewItemFactory.swift b/...llet/UnstoppableWallet/Modules/Wallet/Receive/Address/ReceiveAddressViewItemFactory.swift
@@ -32,7 +32,10 @@ class ReceiveAddressViewItemFactory: IReceiveAddressViewItemFactory {
 
             addressUri.parameters[AddressUri.Field.amountField(blockchainType: item.token.blockchainType)] = amount
             addressUri.parameters[.blockchainUid] = item.token.blockchainType.uid
-            addressUri.parameters[.tokenUid] = item.token.type.id
+            switch item.token.type {
+            case .addressType, .derived: ()
+            default: addressUri.parameters[.tokenUid] = item.token.type.id
+            }
 
             uri = parser.uri(addressUri)
         }