Archives
/
RTL
mirror of https://github.com/Ride-The-Lightning/RTL
2
0
Fork 0
Code Issues Releases Wiki Activity

Currency required if fiat conversion is true

Browse Source 
Currency required if fiat conversion is true
pull/260/head
Shahana Farooqui 4 years ago
parent 5ea53e1816
commit 00c04f9773
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
angular/index.html
Unescape Escape View File

@ -12,5 +12,5 @@
<link rel="stylesheet" href="styles.90ee7bcb73e8367b2a29.css"></head>
<body>
<rtl-app></rtl-app>
<script src="runtime.d6094d81f2dd96ef830c.js" defer></script><script src="polyfills-es5.2f0940c78d869b1e146b.js" nomodule defer></script><script src="polyfills.f1c3d2a0bcdfc4e93ca8.js" defer></script><script src="main.f0466867675a350cb159.js" defer></script></body>
<script src="runtime.d6094d81f2dd96ef830c.js" defer></script><script src="polyfills-es5.2f0940c78d869b1e146b.js" nomodule defer></script><script src="polyfills.f1c3d2a0bcdfc4e93ca8.js" defer></script><script src="main.b52bca9a92f3c05e812e.js" defer></script></body>
</html>

2
angular/main.f0466867675a350cb159.js → angular/main.b52bca9a92f3c05e812e.js
View File

File diff suppressed because one or more lines are too long

9
src/app/shared/components/settings/app-settings/app-settings.component.html
Unescape Escape View File

@ -1,5 +1,5 @@
<div fxLayout="column" fxFlex="100" class="overflow-x-hidden">
<div fxLayout="column" fxLayoutAlign="start stretch" class="settings-container page-sub-title-container mt-1">
<form fxLayout="column" fxLayoutAlign="start stretch" class="settings-container page-sub-title-container mt-1" #form="ngForm">
<div fxFlex="100" class="mb-1">
<fa-icon [icon]="faWrench" class="page-title-img mr-1"></fa-icon>
<span class="page-title">Node Layout</span>
@ -25,11 +25,12 @@
<mat-slide-toggle tabindex="2" color="primary" [(ngModel)]="selNode.settings.fiatConversion" name="fiatConversion">Fiat Conversion</mat-slide-toggle>
<mat-form-field>
<mat-label>Currency Unit</mat-label>
<mat-select [disabled]="!selNode.settings.fiatConversion" [(ngModel)]="selNode.settings.currencyUnit" (selectionChange)="onCurrencyChange($event)" tabindex="3" name="currencyUnit">
<mat-select [disabled]="!selNode.settings.fiatConversion" [(ngModel)]="selNode.settings.currencyUnit" (selectionChange)="onCurrencyChange($event)" tabindex="3" name="currencyUnit" [required]="selNode.settings.fiatConversion">
<mat-option *ngFor="let currencyUnit of currencyUnits" [value]="currencyUnit.id">
{{currencyUnit.id}}
</mat-option>
</mat-select>
<mat-error *ngIf="selNode.settings.fiatConversion && !selNode.settings.currencyUnit">Currency unit is required.</mat-error>
</mat-form-field>
</div>
<mat-form-field fxFlex="30" fxLayoutAlign="start end" *ngIf="appConfig.nodes.length && appConfig.nodes.length > 1;else emptyBlock">
@ -51,7 +52,7 @@
<div fxLayout="column" fxLayout.gt-xs="row" fxFlex="100" fxLayoutAlign="space-between stretch" fxLayoutAlign.gt-xs="start stretch">
<div fxFlex.gt-xs="20" fxFlex.gt-md="15" fxLayout="column" fxLayoutAlign="space-between stretch">
<h4>Mode</h4>
<mat-radio-group color="primary" [(ngModel)]="selectedThemeMode" (change)="chooseThemeMode()">
<mat-radio-group color="primary" [(ngModel)]="selectedThemeMode" (change)="chooseThemeMode()" name="themeMode">
<mat-radio-button tabindex="5" *ngFor="let themeMode of themeModes" [value]="themeMode" [ngClass]="{'mr-4': screenSize === screenSizeEnum.XS || screenSize === screenSizeEnum.SM}">{{themeMode.name}}
</mat-radio-button>
</mat-radio-group>
@ -75,6 +76,6 @@
<button fxFlex="48" fxLayoutAlign="center center" mat-flat-button color="primary" (click)="onUpdateSettings()" tabindex="11">Update</button>
</div>
</div>
</div>
</form>
</div>
<ng-template #emptyBlock><div fxLayout="row" fxFlex="30" fxLayoutAlign="start end"></div></ng-template>

1
src/app/shared/components/settings/app-settings/app-settings.component.ts
Unescape Escape View File

@ -119,6 +119,7 @@ export class AppSettingsComponent implements OnInit, OnDestroy {
}
onUpdateSettings() {
if(this.selNode.settings.fiatConversion && !this.selNode.settings.currencyUnit) { return true; }
let defaultNodeIndex = (this.previousDefaultNode !== this.appConfig.defaultNodeIndex) ? this.appConfig.defaultNodeIndex : null;
this.logger.info(this.selNode.settings);
this.store.dispatch(new RTLActions.OpenSpinner('Updating Settings...'));

Write Preview
Loading…
Cancel
Save