update screenshots

README.md

@@ -3,43 +3,45 @@
 Bitsquare is a P2P Fiat-BTC Exchange, extensible to a generic P2P trading platform (include commodities and
 cryptocurrencies)
 
-This is just a first very basic GUI prototype with mock data.
-There is only the trade process for Sell BTC and the role of the offer taker modelled yet.
+This is just a proof of concept prototype for demonstrating the basic workflow of the trader process.
+It is not at all production code style (no tests, verifications missing, very limited use cases,...).
 
 The project use Java 8 and Maven.
 We use the bitcoinj library and TomP2P for DHT and messaging.
 
 ### Implemented (prototype level):
-* Screen for orderbook with filtering mock offers by amount, price and order type (buy, sell)
-* Screen for creating an offer
-* Screen for offer taking and payment process (needs update)
+* Orderbook with filtering offers by amount, price, order type, trading account(buy, sell)
+* Create offer
+* Take offer
 * Simple persistence
 * bitcoinj integration
 * Setup with account registration and tx with OP_RETURN + embedded and blinded bank account data
 * Offer fee payment with a OP_RETURN tx and fees to miners
 * Pay in to MS fund
 * Payout from MS fund
-* TomP2P as messaging lib integrated and basic use cases in msg screen implemented: orderbook, add order, remove order, find peer, chat with peer
-* Payment process until wait for bank transfer implemented with messaging
+* TomP2P as messaging lib integrated and basic use cases in msg screen implemented: orderbook, add order, remove order, peer interaction
+* Payment process implemented with messaging for Offerer buy BTC case
+* Hash of contract data embedded into tx (OP_RETURN)
 
 ### Next steps:
-* Payment process after wait for bank transfer implemented with messaging
-* Arbitrator integration
+* Conceptual refinements
+* Arbitrator integration concept
 * Other trade variants (Buy BTC taker, Sell BTC offerer, Sell BTC offerer)
-* ...
+* Develop funding model
+* Start development of production version
 
 
 ### Screenshots of basic screens:
-* [Registration screen 1](https://github.com/bitsquare/bitsquare/tree/master/screenshots/reg1.png)
-* [Registration screen 2](https://github.com/bitsquare/bitsquare/tree/master/screenshots/reg2.png)
-* [Registration screen 3](https://github.com/bitsquare/bitsquare/tree/master/screenshots/reg3.png)
+* [Registration screen 1](https://github.com/bitsquare/bitsquare/tree/master/screenshots/registration_3.png)
+* [Registration screen 2](https://github.com/bitsquare/bitsquare/tree/master/screenshots/registration_bank_account.png)
 * [Orderbook screen 1](https://github.com/bitsquare/bitsquare/tree/master/screenshots/orderbook1.png)
 * [Orderbook screen 2](https://github.com/bitsquare/bitsquare/tree/master/screenshots/orderbook2.png)
-* [Create Offer screen 1](https://github.com/bitsquare/bitsquare/tree/master/screenshots/newOffer1.png)
-* [Create Offer screen 2](https://github.com/bitsquare/bitsquare/tree/master/screenshots/newOffer2.png)
-* [Trade screen](https://github.com/bitsquare/bitsquare/tree/master/screenshots/trade.png)
-* [Bank transfer screen](https://github.com/bitsquare/bitsquare/tree/master/screenshots/bank_transfer.png)
-* [Trade completed screen](https://github.com/bitsquare/bitsquare/tree/master/screenshots/completed.png)
+* [Create Offer screen](https://github.com/bitsquare/bitsquare/tree/master/screenshots/create_offer_2.png)
+* [Take offer screen](https://github.com/bitsquare/bitsquare/tree/master/screenshots/take_offer.png)
+* [Deposit tx screen](https://github.com/bitsquare/bitsquare/tree/master/screenshots/deposit_conf.png)
+* [Check bank tx screen](https://github.com/bitsquare/bitsquare/tree/master/screenshots/bank_tx_inited.png)
+* [Trade completed screen](https://github.com/bitsquare/bitsquare/tree/master/screenshots/trade_complete.png)
+* [More screenshots](https://github.com/bitsquare/bitsquare/tree/master/screenshots)
 
 
 ### Links:

TODO.txt

@@ -5,6 +5,7 @@ low prio:
 - start with orderbook and open registration when user interacts with orderbook (take offer, create offer)
 - settings screen
 - return to setup when unregistered, change/add bank accounts from settings
+- refactor trade process
 - formatting
 - validation
 

src/main/java/io/bitsquare/gui/market/trade/TakerTradeController.java

@@ -362,7 +362,7 @@ public class TakerTradeController implements Initializable, ChildController
         row = -1;
         FormBuilder.addHeaderLabel(gridPane, "Trade successfully completed", ++row);
 
-        String fiatReceived = Formatter.formatVolume(trade.getOffer().getPrice() * trade.getTradeAmount().doubleValue());
+        String fiatReceived = Formatter.formatVolume(trade.getOffer().getPrice() * BtcFormatter.satoshiToBTC(trade.getTradeAmount()));
 
         FormBuilder.addTextField(gridPane, "You have sold (BTC):", Utils.bitcoinValueToFriendlyString(trade.getTradeAmount()), ++row);
         if (takerIsSelling())

src/main/java/io/bitsquare/gui/orders/OrdersController.java

@@ -7,6 +7,7 @@ import de.jensd.fx.fontawesome.AwesomeDude;
 import de.jensd.fx.fontawesome.AwesomeIcon;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.bank.BankAccountType;
+import io.bitsquare.btc.BtcFormatter;
 import io.bitsquare.btc.Fees;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.gui.ChildController;
@@ -308,7 +309,7 @@ public class OrdersController implements Initializable, ChildController
             primaryBankAccountIDTitleLabel.setText("Total fees (offer fee + tx fee):");
             secondaryBankAccountIDTitleLabel.setText("Refunded collateral:");
 
-            String fiatPayed = Formatter.formatVolume(trade.getOffer().getPrice() * trade.getTradeAmount().doubleValue());
+            String fiatPayed = Formatter.formatVolume(trade.getOffer().getPrice() * BtcFormatter.satoshiToBTC(trade.getTradeAmount()));
 
             bankAccountTypeTextField.setText(Utils.bitcoinValueToFriendlyString(trade.getTradeAmount()));
             holderNameTextField.setText(fiatPayed);