fixed how various currencies are toggled when using a plain address
This commit is contained in:
parent
ec6b066e19
commit
a53e236f9c
1 changed files with 10 additions and 9 deletions
|
|
@ -119,10 +119,11 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
||||||
fixedUnit = true;
|
fixedUnit = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (availableUnits.length == 2) {
|
unitIndex = lodash.findIndex(availableUnits, {
|
||||||
unitIndex = 1;
|
isFiat: true
|
||||||
altUnitIndex = 0;
|
});
|
||||||
}
|
|
||||||
|
altUnitIndex = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Go to...
|
// Go to...
|
||||||
|
|
@ -246,13 +247,13 @@ angular.module('copayApp.controllers').controller('amountController', function($
|
||||||
|
|
||||||
if (fixedUnit) return;
|
if (fixedUnit) return;
|
||||||
|
|
||||||
unitIndex++;
|
if (!(availableUnits[unitIndex].isFiat && availableUnits.length > 2 && altUnitIndex == 0)) {
|
||||||
if (unitIndex >= availableUnits.length) unitIndex = 0;
|
unitIndex++;
|
||||||
|
if (unitIndex >= availableUnits.length) unitIndex = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (availableUnits[unitIndex].isFiat) {
|
if (availableUnits[unitIndex].isFiat) {
|
||||||
// Always return to BTC... TODO?
|
altUnitIndex = altUnitIndex == 0 && availableUnits.length > 2 ? 1 : 0;
|
||||||
altUnitIndex = 0;
|
|
||||||
} else {
|
} else {
|
||||||
altUnitIndex = lodash.findIndex(availableUnits, {
|
altUnitIndex = lodash.findIndex(availableUnits, {
|
||||||
isFiat: true
|
isFiat: true
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue