Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 60239b6

Browse files
theotnieltheotniel
authored
AW-88 - Removed CCY conversion (#52)
1 parent dd2b8e9 commit 60239b6

9 files changed

Lines changed: 25 additions & 118 deletions

File tree

‎src/main/java/org/aion/wallet/ui/MainWindow.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class MainWindow extends Application {
4141
private double xOffset;
4242
private double yOffset;
4343
private Stage stage;
44-
private final Timer timer = new Timer();
44+
private final Timer timer = new Timer(true);
4545

4646
@Override
4747
public void start(final Stage stage) throws IOException {

‎src/main/java/org/aion/wallet/ui/components/SendController.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ public class SendController extends AbstractController {
5252
private TextArea accountAddress;
5353
@FXML
5454
private TextField accountBalance;
55-
@FXML
56-
private TextField equivalentEUR;
57-
@FXML
58-
private TextField equivalentUSD;
5955

6056
private AccountDTO account;
6157

@@ -140,20 +136,10 @@ private void handleAccountEvent(final AccountEvent event) {
140136

141137
accountBalance.setVisible(true);
142138
setAccountBalanceText();
143-
144-
equivalentEUR.setVisible(true);
145-
equivalentEUR.setText(convertBalanceToCcy(account, AionConstants.AION_TO_EUR) + " " + AionConstants.EUR_CCY);
146-
UIUtils.setWidth(equivalentEUR);
147-
148-
equivalentUSD.setVisible(true);
149-
equivalentUSD.setText(convertBalanceToCcy(account, AionConstants.AION_TO_USD) + " " + AionConstants.USD_CCY);
150-
UIUtils.setWidth(equivalentUSD);
151139
} else if (AccountEvent.Type.LOCKED.equals(event.getType())) {
152140
if (event.getAccount().equals(account)) {
153141
accountAddress.setText("");
154142
accountBalance.setVisible(false);
155-
equivalentEUR.setVisible(false);
156-
equivalentUSD.setVisible(false);
157143
account = null;
158144
}
159145
}
@@ -173,10 +159,6 @@ protected void registerEventBusConsumer() {
173159
EventBusFactory.getBus(AccountEvent.ID).register(this);
174160
}
175161

176-
private double convertBalanceToCcy(final AccountDTO account, final double exchangeRate) {
177-
return Double.parseDouble(account.getBalance()) * exchangeRate;
178-
}
179-
180162
private void setAccountBalanceText() {
181163
accountBalance.setText(account.getBalance() + " " + AionConstants.CCY);
182164
UIUtils.setWidth(accountBalance);

‎src/main/java/org/aion/wallet/ui/components/partials/SyncStatusController.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.aion.wallet.connector.dto.SyncInfoDTO;
88
import org.aion.wallet.ui.components.AbstractController;
99
import org.aion.wallet.events.RefreshEvent;
10-
import org.aion.wallet.util.SyncStatusFormatter;
1110

1211
import java.net.URL;
1312
import java.util.ResourceBundle;
@@ -36,7 +35,11 @@ protected final void refreshView(final RefreshEvent event) {
3635
}
3736
}
3837

39-
private void setSyncStatus(SyncInfoDTO syncInfo) {
40-
progressBarLabel.setText(SyncStatusFormatter.formatSyncStatusByBlockNumbers(syncInfo));
38+
private void setSyncStatus(final SyncInfoDTO syncInfo) {
39+
progressBarLabel.setText(getSyncLabelText(syncInfo));
40+
}
41+
42+
private String getSyncLabelText(final SyncInfoDTO syncInfo) {
43+
return syncInfo.getChainBestBlkNumber() + "/" + syncInfo.getNetworkBestBlkNumber() + " total blocks";
4144
}
4245
}

‎src/main/java/org/aion/wallet/util/AddressUtils.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
import org.aion.base.util.TypeConverter;
44

55
public class AddressUtils {
6+
67
public static boolean isValid(String address) {
7-
return address != null && !address.equalsIgnoreCase("");
8+
return address != null && !address.isEmpty();
89
}
910

1011
public static boolean equals(String addrOne, String addrTwo) {

‎src/main/java/org/aion/wallet/util/AionConstants.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,9 @@ private AionConstants() {}
1616

1717
public static final BigInteger DEFAULT_NRG_PRICE = BigInteger.valueOf(10 * AMP);
1818

19-
public static final int BLOCK_MINING_TIME_SECONDS = 10;
19+
private static final int BLOCK_MINING_TIME_SECONDS = 10;
2020

2121
public static final Long BLOCK_MINING_TIME_MILLIS = BLOCK_MINING_TIME_SECONDS * 1000L;
2222

23-
public static final Integer MAX_BLOCKS_FOR_LATEST_TRANSACTIONS_QUERY = 100000;
24-
25-
public static final String EUR_CCY = "EUR";
26-
27-
public static final String USD_CCY = "USD";
28-
29-
public static final double AION_TO_EUR = 2.46;
30-
31-
public static final double AION_TO_USD = 3.05;
32-
3323
public static final int VALIDATION_BLOCKS_FOR_TRANSACTIONS = 50;
3424
}

‎src/main/java/org/aion/wallet/util/BalanceUtils.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,4 @@ public static String formatBalance(final BigInteger balance) {
2626
public static BigInteger extractBalance(final String formattedBalance) {
2727
return new BigDecimal(formattedBalance).multiply(WEI_MULTIPLIER).toBigInteger();
2828
}
29-
30-
//TODO will be done in future story
31-
public static String convertBalance() {
32-
return null;
33-
}
3429
}

‎src/main/java/org/aion/wallet/util/SyncStatusFormatter.java‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎src/main/java/org/aion/wallet/util/URLManager.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,38 @@
1010
import java.net.URISyntaxException;
1111

1212
public class URLManager {
13+
1314
private static final Logger log = AionLoggerFactory.getLogger(LogEnum.WLT.name());
14-
public static final String TRANSACTION_URL = "/#/transaction/";
15+
16+
private static final String TRANSACTION_URL = "/#/transaction/";
1517

1618
public static void openDashboard() {
1719
openURL(AionConstants.AION_URL);
1820
}
1921

2022
public static void openTransaction(final String transactionHash) {
21-
if(transactionHash != null && !transactionHash.isEmpty()) {
23+
if (transactionHash != null && !transactionHash.isEmpty()) {
2224
openURL(AionConstants.AION_URL + TRANSACTION_URL + transactionHash);
2325
}
2426
}
2527

26-
public static void openURL(String URL) {
27-
if(URL != null) {
28-
final String OS = System.getProperty("os.name").toLowerCase();
29-
if(OS.indexOf("win") >= 0) {
28+
private static void openURL(final String URL) {
29+
if (URL != null) {
30+
final String os = System.getProperty("os.name").toLowerCase();
31+
if (os.contains("win")) {
3032
try {
3133
Desktop.getDesktop().browse(new URI(URL));
3234
} catch (IOException | URISyntaxException e) {
3335
log.error("Exception occurred trying to open website: %s", e.getMessage(), e);
3436
}
35-
}
36-
else if(OS.indexOf("nix") >= 0 || OS.indexOf("nux") >= 0 || OS.indexOf("aix") > 0 )
37-
try {
38-
if (Runtime.getRuntime().exec(new String[]{"which", "xdg-open"}).getInputStream().read() != -1) {
39-
Runtime.getRuntime().exec(new String[]{"xdg-open", URL});
37+
} else if (os.contains("nix") || os.contains("nux") || os.indexOf("aix") > 0)
38+
try {
39+
if (Runtime.getRuntime().exec(new String[]{"which", "xdg-open"}).getInputStream().read() != -1) {
40+
Runtime.getRuntime().exec(new String[]{"xdg-open", URL});
41+
}
42+
} catch (IOException e) {
43+
e.printStackTrace();
4044
}
41-
} catch (IOException e) {
42-
e.printStackTrace();
43-
}
4445
}
4546
}
4647
}

‎src/main/resources/org/aion/wallet/ui/components/partials/SendPane.fxml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@
2121
<HBox>
2222
<TextField fx:id="accountBalance" editable="false" styleClass="balance-value" visible="false"/>
2323
</HBox>
24-
<Label text="Equivalent values" styleClass="header-text"/>
25-
<HBox>
26-
<TextField fx:id="equivalentEUR" editable="false" styleClass="balance-value" visible="false" />
27-
</HBox>
28-
<HBox>
29-
<TextField fx:id="equivalentUSD" editable="false" styleClass="balance-value" visible="false" />
30-
</HBox>
3124
</VBox>
3225
<VBox spacing="5" prefWidth="400.0">
3326
<Label text="New transaction" styleClass="header-text" />

0 commit comments

Comments
 (0)