poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Currency to string

This commit is contained in:
obscuren 2014-02-25 11:24:04 +01:00
parent 6451a7187a
commit dba1ba3822
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/gui.go
View File

@ -26,7 +26,7 @@ func NewTxFromTransaction(tx *ethchain.Transaction) *Tx {
hash := hex.EncodeToString(tx.Hash()) hash := hex.EncodeToString(tx.Hash())
sender := hex.EncodeToString(tx.Recipient) sender := hex.EncodeToString(tx.Recipient)
return &Tx{Hash: hash, Value: tx.Value.String(), Address: sender} return &Tx{Hash: hash, Value: ethutil.CurrencyToString(tx.Value), Address: sender}
} }
// Creates a new QML Block from a chain block // Creates a new QML Block from a chain block
@ -154,7 +154,7 @@ func (ui *Gui) update() {
ui.eth.TxPool.Subscribe(txChan) ui.eth.TxPool.Subscribe(txChan)
account := ui.eth.BlockManager.GetAddrState(ui.addr).Account account := ui.eth.BlockManager.GetAddrState(ui.addr).Account
ui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", account.Amount)) ui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", ethutil.CurrencyToString(account.Amount)))
for { for {
select { select {
case txMsg := <-txChan: case txMsg := <-txChan:
@ -162,22 +162,22 @@ func (ui *Gui) update() {
ui.txDb.Put(tx.Hash(), tx.RlpEncode()) ui.txDb.Put(tx.Hash(), tx.RlpEncode())
ui.win.Root().Call("addTx", NewTxFromTransaction(tx)) ui.win.Root().Call("addTx", NewTxFromTransaction(tx))
// Yeah, yeah, stupid code. Refactor next week // TODO FOR THE LOVE OF EVERYTHING GOOD IN THIS WORLD REFACTOR ME
if txMsg.Type == ethchain.TxPre { if txMsg.Type == ethchain.TxPre {
if bytes.Compare(tx.Sender(), ui.addr) == 0 { if bytes.Compare(tx.Sender(), ui.addr) == 0 {
ui.win.Root().Call("setWalletValue", fmt.Sprintf("%v (- %v)", account.Amount, tx.Value)) ui.win.Root().Call("setWalletValue", fmt.Sprintf("%v (- %v)", ethutil.CurrencyToString(account.Amount), ethutil.CurrencyToString(tx.Value)))
ui.eth.BlockManager.GetAddrState(ui.addr).Nonce += 1 ui.eth.BlockManager.GetAddrState(ui.addr).Nonce += 1
fmt.Println("Nonce", ui.eth.BlockManager.GetAddrState(ui.addr).Nonce) fmt.Println("Nonce", ui.eth.BlockManager.GetAddrState(ui.addr).Nonce)
} else if bytes.Compare(tx.Recipient, ui.addr) == 0 { } else if bytes.Compare(tx.Recipient, ui.addr) == 0 {
ui.win.Root().Call("setWalletValue", fmt.Sprintf("%v (+ %v)", account.Amount, tx.Value)) ui.win.Root().Call("setWalletValue", fmt.Sprintf("%v (+ %v)", ethutil.CurrencyToString(account.Amount), ethutil.CurrencyToString(tx.Value)))
} }
} else { } else {
if bytes.Compare(tx.Sender(), ui.addr) == 0 { if bytes.Compare(tx.Sender(), ui.addr) == 0 {
amount := account.Amount.Sub(account.Amount, tx.Value) amount := account.Amount.Sub(account.Amount, tx.Value)
ui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", amount)) ui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", ethutil.CurrencyToString(amount)))
} else if bytes.Compare(tx.Recipient, ui.addr) == 0 { } else if bytes.Compare(tx.Recipient, ui.addr) == 0 {
amount := account.Amount.Sub(account.Amount, tx.Value) amount := account.Amount.Sub(account.Amount, tx.Value)
ui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", amount)) ui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", ethutil.CurrencyToString(amount)))
} }
} }
} }

3
wallet.qml
View File

@ -215,6 +215,7 @@ ApplicationWindow {
text: "Connect" text: "Connect"
} }
Button { Button {
id: importAppButton
anchors.left: connectButton.right anchors.left: connectButton.right
anchors.leftMargin: 5 anchors.leftMargin: 5
onClicked: openAppDialog.open() onClicked: openAppDialog.open()
@ -222,6 +223,8 @@ ApplicationWindow {
} }
Label { Label {
anchors.left: importAppButton.right
anchors.leftMargin: 5
id: walletValueLabel id: walletValueLabel
} }