Skip to content
This repository has been archived by the owner on Mar 28, 2023. It is now read-only.

Use fee from settings #545

Merged
merged 2 commits into from
Jul 3, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/languages/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
"helperVisualEffects": "Transitions, Easing, Opacity",
"helperWindowControls": "Maximize, Minimize & Close controls",
"helperSaveMetaData": "Store additional transaction information",
"helperDefaultFee": "Average is recommended. High may clear faster.",
"helperDefaultFee": "High is recommended for the fastest transactions",
"helperServerManagement": "Switch and manage server connections",
"helperServerPeers": "Peers you're connected to",
"smtp": {
Expand Down Expand Up @@ -1303,7 +1303,7 @@
"orderCompletionModelErrors": {
"provideReview": "Please provide a review.",
"provideRating": "Please select a rating."
},
},
"bitcoinCurrencyUnits": {
"BTC": "BTC",
"MBTC": "mBTC",
Expand Down
1 change: 1 addition & 0 deletions js/models/wallet/Spend.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ export default Spend;
export function spend(fields) {
const attrs = {
currency: app && app.settings && app.settings.get('localCurrency') || 'BTC',
feeLevel: app && app.localSettings && app.localSettings.get('defaultTransactionFee') || 'high',
memo: '',
...fields,
};
Expand Down
3 changes: 2 additions & 1 deletion js/views/modals/purchase/ConfirmWallet.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ export default class extends BaseVw {
this.listenTo(app.walletBalance, 'change:confirmed', () => this.render());

// fetch the estimated fee and rerender when it returns
this.fetchEstimatedFee = $.get(app.getServerUrl('wallet/estimatefee/?feeLevel=NORMAL'))
const feeLevel = app.localSettings.get('defaultTransactionFee').toUpperCase();
this.fetchEstimatedFee = $.get(app.getServerUrl(`wallet/estimatefee/?feeLevel=${feeLevel}`))
.done(data => {
if (this.isRemoved()) return;
this.fee = integerToDecimal(data, true);
Expand Down