Skip to content

Commit 1033a07

Browse files
committed
Modified the dropdown, so the currency can be changed without a switch button.
1 parent af4bcec commit 1033a07

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

cards/asset/addon/components/isolated.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ import { task } from 'ember-concurrency';
99

1010
export default LiveIsolatedCard.extend(AssetBaseMixin, CurrencyParamsMixin, {
1111
layout,
12-
currencies: [{name: 'USD'}, {name: 'EUR'}, {name: 'BTC'}],
13-
selectedSymbol: {name: 'USD'},
12+
currencies: [{name: 'View details as USD', currency: 'USD'},
13+
{name: 'View details as EUR', currency: 'EUR'},
14+
{name: 'View details as BTC', currency: 'BTC'}],
15+
selectedSymbol:{name: 'View details as USD', currency: 'USD'},
1416
cardstackData: service(),
1517
fastboot: injectOptional.service(),
1618

@@ -51,7 +53,11 @@ export default LiveIsolatedCard.extend(AssetBaseMixin, CurrencyParamsMixin, {
5153
this.set('wallet', wallet);
5254
}
5355
}).drop(),
54-
56+
setCurrencyDropDown(selectedSymbol){
57+
console.log(selectedSymbol);
58+
this.set('selectedSymbol', selectedSymbol);
59+
this.setCurrency(selectedSymbol.currency);
60+
}
5561
});
5662

5763

cards/asset/addon/styles/asset-isolated.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
}
100100

101101
.asset-isolated_currency_and_balance_row > .asset-isolated__balance-fiat{
102-
padding-top: 5px;
102+
padding-top: 15px;
103103
width: 150px;
104104
}
105105

cards/asset/addon/templates/isolated.hbs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@
4242
<div class="row asset-isolated_currency_and_balance_row">
4343
<div class="asset-isolated__currency">
4444
<div class="asset-isolated__currency-switcher row">
45-
<button class="asset-isolated-currency-display-tag" disabled=true>View Data As</button>
46-
<Dropdown class="asset-isolated-currency-switch-dropdown" @options={{this.currencies}} @label='' @selected={{this.selectedSymbol}} style='height:28px; width:100px; padding-top:30px'/>
47-
<button class="asset-isolated-currency-switch-button" {{action setCurrency this.selectedSymbol.name}}>Switch</button>
45+
<Dropdown class="asset-isolated-currency-switch-dropdown" @options={{this.currencies}} @label='' @selected={{this.selectedSymbol}}
46+
@changeAction={{action setCurrencyDropDown}} style='width:210px;'/>
4847
{{!--<button class="{{if (eq currency 'USD') 'active'}}" {{action setCurrency 'USD'}} data-test-asset-isolated-usd-button>USD</button>
4948
<button class="{{if (eq currency 'EUR') 'active'}}" {{action setCurrency 'EUR'}} data-test-asset-isolated-eur-button>EUR</button>
5049
<button class="{{if (eq currency 'BTC') 'active'}}" {{action setCurrency 'BTC'}} data-test-asset-isolated-btc-button>BTC</button>

packages/common/addon/mixins/currency-params.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ export default Mixin.create({
4242
setParam('currency', currency);
4343
}
4444
}
45-
}
45+
}
4646
});

0 commit comments

Comments
 (0)