-
+
@@ -148,9 +141,9 @@ export default class Footer extends React.Component {
: ''}
-
+
+
)
diff --git a/src/app/stores/CoinStore.js b/src/app/stores/CoinStore.js
index 3b0a9c0..a6ee60d 100644
--- a/src/app/stores/CoinStore.js
+++ b/src/app/stores/CoinStore.js
@@ -60,7 +60,7 @@ CoinStore.setMaxListeners(1000)
const register = {
[ ActionTypes.COIN_DATA ]: (data) => {
- CoinStore.syncCoins(data.coin_data)
+ CoinStore.syncCoins(data.coinData)
CoinStore.emitChange()
},
[ ActionTypes.NEW_TRADE ]: (data) => {
diff --git a/src/app/stores/CurrencyStore.js b/src/app/stores/CurrencyStore.js
index ffd7b27..2e476bb 100644
--- a/src/app/stores/CurrencyStore.js
+++ b/src/app/stores/CurrencyStore.js
@@ -41,11 +41,11 @@ CurrencyStore.setMaxListeners(1000)
const register = {
[ ActionTypes.CURRENCY_DATA ]: (data) => {
- CurrencyStore.syncCurrencies(data.currency_data.rates)
+ CurrencyStore.syncCurrencies(data.currencyData.rates)
CurrencyStore.emitChange()
},
[ ActionTypes.SELECT_CURRENCY ]: (data) => {
- CurrencyStore.setSelectedCurrency(data.selected_currency)
+ CurrencyStore.setSelectedCurrency(data.selectedCurrency)
CurrencyStore.emitChange()
}
}
diff --git a/src/app/utils/format.js b/src/app/utils/format.js
index e1d18ff..ff5afb0 100644
--- a/src/app/utils/format.js
+++ b/src/app/utils/format.js
@@ -4,6 +4,7 @@ export const isPositive = (value) => value >= 0
export const getFormattedVolume = (volume) => numeral(volume).format('0.0a').toUpperCase()
export const getFormattedBTCPrice = (price) => price === 1 ? 1 : numeral(price).format('0,0.000000')
export const getFormattedCurrencyPrice = (price) => numeral(price).format('0,0.0000')
+export const getFormattedCurrencyPriceShort = (price) => numeral(price).format('0,0.00')
export const getFormattedPercentage = (value) => {
const formattedValue = numeral(value / 100).format('0.00%')
diff --git a/src/main.js b/src/main.js
index e2f8ece..472535e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -23,8 +23,9 @@ if (platform === 'darwin' || platform === 'win32') {
app.on('ready', () => {
mb.tray.setTitle('Donut')
- ipcMain.on('update-btc-price', (event, price) => {
- mb.tray.setTitle(price)
+ ipcMain.on('update-btc-price', (event, { shortPrice, price, currency }) => {
+ mb.tray.setTitle(`${shortPrice} ${currency}`)
+ mb.tray.setToolTip(`${price} ${currency}`)
})
})
} else {
diff --git a/src/sass/_photon.scss b/src/sass/_photon.scss
index af253f3..78ecd50 100644
--- a/src/sass/_photon.scss
+++ b/src/sass/_photon.scss
@@ -17,6 +17,5 @@
}
.toolbar-footer {
- overflow-x: auto;
- white-space: nowrap;
+ -webkit-app-region: no-drag!important;
}
diff --git a/src/sass/_utility.scss b/src/sass/_utility.scss
index b19aa35..3f617a0 100644
--- a/src/sass/_utility.scss
+++ b/src/sass/_utility.scss
@@ -57,8 +57,18 @@
}
}
-.btn-group-currencies {
- display: inline-flex;
+.currency-list {
+ height: 23px;
+ width: auto;
+ border-top-color: #c2c0c2;
+ border-right-color: #c2c0c2;
+ border-bottom-color: #a19fa1;
+ border-left-color: #c2c0c2;
+ margin-right: 4px;
+}
+
+.btn-group-actions {
+ margin-bottom: -1px;
}
.online {