Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-25 16:05:28 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use security deposit as flat rate instead of percentage, remove wording of collateral

Browse source
This commit is contained in:
Manfred Karrer 2014-10-23 15:32:01 +02:00
parent 1fddf079b7
commit 98b6f72f90
32 changed files with 147 additions and 325 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPMTest.java
View file

@ -57,14 +57,6 @@ public class CreateOfferPMTest {
@Test
public void testBindings() {
model.collateralAsLong.set(100);
presenter.price.set("500");
presenter.amount.set("1");
assertEquals("500.00", presenter.volume.get());
assertEquals(Coin.COIN, model.amountAsCoin.get());
assertEquals(Fiat.valueOf("USD", 500 * 10000), model.priceAsFiat.get());
assertEquals(Fiat.valueOf("USD", 500 * 10000), model.volumeAsFiat.get());
presenter.price.set("500");
presenter.volume.set("500");
assertEquals("1.00", presenter.amount.get());

51
src/test/java/io/bitsquare/gui/main/trade/createoffer/uimock/CreateOfferControllerUIMock.java
View file

@ -56,10 +56,10 @@ public class CreateOfferControllerUIMock implements Initializable {
@FXML private TextField addressTextField;
@FXML private TextField balanceTextField;
@FXML private Label buyLabel, confirmationLabel, txTitleLabel, collateralLabel;
@FXML private Label buyLabel, confirmationLabel, txTitleLabel, securityDepositLabel;
@FXML private TextField amountTextField, minAmountTextField, priceTextField, volumeTextField;
@FXML private Button placeOfferButton, closeButton;
@FXML private TextField totalToPayTextField, collateralTextField, bankAccountTypeTextField,
@FXML private TextField totalToPayTextField, securityDepositTextField, bankAccountTypeTextField,
bankAccountCurrencyTextField, bankAccountCountyTextField, acceptedCountriesTextField,
acceptedLanguagesTextField,
summaryBtcTextField, transactionIdTextField;
@ -72,49 +72,6 @@ public class CreateOfferControllerUIMock implements Initializable {
@Override
public void initialize(URL url, ResourceBundle rb) {
/*
paymentInfoPane.setVisible(false);
collateralLabel.setVisible(false);
collateralTextField.setVisible(false);
offerFeeLabel.setVisible(false);
offerFeeTextField.setVisible(false);
networkFeeLabel.setVisible(false);
networkFeeTextField.setVisible(false);
totalsSeparator.setVisible(false);
summaryBtcLabel.setVisible(false);
summaryBtcTextField.setVisible(false);
paymentInfoLabel.setVisible(false);
paymentInfoIcon.setVisible(false);
showPayFundsScreenButton.setVisible(false);
payFundsPane.setVisible(false);
totalToPayLabel.setVisible(false);
totalToPayTextField.setVisible(false);
addressLabel.setVisible(false);
addressTextField.setVisible(false);
balanceLabel.setVisible(false);
balanceTextField.setVisible(false);
payFundsInfoIcon.setVisible(false);
payFundsInfoLabel.setVisible(false);
placeOfferButton.setVisible(false);
showDetailsButton.setVisible(false);
showDetailsPane.setVisible(false);
showDetailsTitleLabel.setVisible(false);
acceptedCountriesLabel.setVisible(false);
acceptedCountriesTextField.setVisible(false);
acceptedLanguagesLabel.setVisible(false);
acceptedLanguagesTextField.setVisible(false);
acceptedArbitratorsLabel.setVisible(false);
acceptedArbitratorsTextField.setVisible(false);
bankAccountTypeLabel.setVisible(false);
bankAccountTypeTextField.setVisible(false);
bankAccountCurrencyLabel.setVisible(false);
bankAccountCurrencyTextField.setVisible(false);
bankAccountCountyLabel.setVisible(false);
bankAccountCountyTextField.setVisible(false);
showDetailsInfoIcon.setVisible(false);
showDetailsInfoLabel.setVisible(false);*/
}
/* @FXML
@ -143,8 +100,8 @@ public class CreateOfferControllerUIMock implements Initializable {
showPaymentInfoScreenButton.setVisible(false);
paymentInfoPane.setVisible(true);
collateralLabel.setVisible(true);
collateralTextField.setVisible(true);
securityDepositLabel.setVisible(true);
securityDepositTextField.setVisible(true);
offerFeeLabel.setVisible(true);
offerFeeTextField.setVisible(true);
networkFeeLabel.setVisible(true);

2
src/test/java/io/bitsquare/msg/dhttest/DHTTestController.java
View file

@ -133,7 +133,7 @@ public class DHTTestController implements Initializable {
CountryUtil.getDefaultCountry(),
"bankAccountUID",
new ArrayList<>(),
10,
Coin.parseCoin("0.1"),
new ArrayList<>(),
new ArrayList<>());