This repository has been archived by the owner on Jun 2, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 719
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add new line with wallet name on Transaction Confirmation (#866)
* Add new line with wallet name on Transaction Confirmation * Changge wallet info used for currentWalletTitle to improve clarity. * Change visual appearance of sender wallet view. * Change title From Wallet -> From. Avoid passing Keystore. * Use localizable string instead * Remove useless localized string * Change Sender -> From * Remove variables, combined in other string variable. * Add unit test for format of string in ConfirmPaymentDetailsViewModel * Add factory to PreviewTransaction * Impove ConfirmPaymentDetailsViewModelTests * Shorten address
- Loading branch information
Showing
6 changed files
with
67 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // Copyright DApps Platform Inc. All rights reserved. | ||
|
|
||
| import Foundation | ||
| import BigInt | ||
| @testable import Trust | ||
| import TrustCore | ||
|
|
||
| extension PreviewTransaction { | ||
| static func make( | ||
| address: Address = EthereumAddress.zero | ||
| ) -> PreviewTransaction { | ||
| return PreviewTransaction( | ||
| value: BigInt(), | ||
| account: .make(), | ||
| address: EthereumAddress.zero, | ||
| contract: EthereumAddress.zero, | ||
| nonce: BigInt(), | ||
| data: Data(), | ||
| gasPrice: BigInt(), | ||
| gasLimit: BigInt(), | ||
| transfer: Transfer.init(server: .make(), type: .token(.make())) | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
TrustTests/Transfer/ViewModels/ConfirmPaymentDetailsViewModelTests.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // Copyright DApps Platform Inc. All rights reserved. | ||
|
|
||
| import XCTest | ||
| import Realm | ||
| import RealmSwift | ||
| import BigInt | ||
| @testable import Trust | ||
| import TrustCore | ||
|
|
||
| class ConfirmPaymentDetailsViewModelTests: XCTestCase { | ||
|
|
||
| func testActionButtonTitleOnSignAndSend() { | ||
|
|
||
| let transaction: PreviewTransaction = .make(address: EthereumAddress.zero) | ||
| let session: WalletSession = .make() | ||
| let viewModel = ConfirmPaymentDetailsViewModel( | ||
| transaction: transaction, | ||
| session: session, | ||
| server: .make() | ||
| ) | ||
| let address = session.account.address.description | ||
| let description = session.account.info.name + " " + "(\(address.prefix(10))...\(address.suffix(8)))" | ||
|
|
||
| XCTAssertEqual(description, viewModel.currentWalletDescriptionString) | ||
| } | ||
| } |