Skip to content

Commit

Permalink
Fix windows fiat currency dropdown issue
Browse files Browse the repository at this point in the history
  • Loading branch information
harshjv committed Jan 6, 2017
1 parent 825662f commit 5b947d9
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "donut",
"version": "2.2.1-alpha.1",
"version": "2.2.1",
"description": "Cross platform cryptocurrency tracker",
"main": "main.js",
"scripts": {
Expand Down
7 changes: 3 additions & 4 deletions src/app/components/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,7 @@ export default class Footer extends React.Component {

const { currencies, isUpdateAvailable, online, version, selectedCurrency } = this.state

const currencyKeys = Object.keys(currencies)
const currencyList = currencyKeys.map((currency) => {
const currencyList = currencies.map((currency) => {
return <option key={currency} value={currency}>{currency}</option>
})

Expand Down Expand Up @@ -141,9 +140,9 @@ export default class Footer extends React.Component {
<span className='icon icon-cancel' />
</button> : ''}
</div>
<select className='form-control currency-list pull-right' value={selectedCurrency} onChange={this.handleCurrencyChange}>
{currencyList.length > 0 ? <select className='form-control currency-list pull-right' value={selectedCurrency} onChange={this.handleCurrencyChange}>
{currencyList}
</select>
</select> : ''}
</div>
</footer>
)
Expand Down
2 changes: 1 addition & 1 deletion src/app/stores/CurrencyStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class CurrencyStoreClass extends BaseStore {
}

getCurrencies () {
return this.currencyMap
return Object.keys(this.currencyMap)
}

syncCurrencies (currencies) {
Expand Down
2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Cross platform cryptocurrency tracker",
"homepage": "https://harshjv.github.io/donut/",
"license": "MIT",
"version": "2.2.1-alpha.1",
"version": "2.2.1",
"main": "main.js",
"repository": "https://github.com/harshjv/donut",
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions src/sass/_photon.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
border-left-color: #c2c0c2;
}

.toolbar-footer {
-webkit-app-region: no-drag!important;
.toolbar-footer, .toolbar-actions {
-webkit-app-region: no-drag;
}

0 comments on commit 5b947d9

Please sign in to comment.