Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
Breeze
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DeStream-public
Breeze
Commits
7fdf81f5
Commit
7fdf81f5
authored
Nov 20, 2018
by
Maxim Bogdanov
🙉
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added ability to choose Fee Type.
parent
0385ae83
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
api.service.ts
Breeze.UI/src/app/shared/services/api.service.ts
+2
-2
send.component.html
Breeze.UI/src/app/wallet/send/send.component.html
+9
-9
send.component.ts
Breeze.UI/src/app/wallet/send/send.component.ts
+1
-1
No files found.
Breeze.UI/src/app/shared/services/api.service.ts
View file @
7fdf81f5
...
@@ -205,7 +205,7 @@ export class ApiService {
...
@@ -205,7 +205,7 @@ export class ApiService {
params
.
set
(
'allowUnconfirmed'
,
"true"
);
params
.
set
(
'allowUnconfirmed'
,
"true"
);
return
this
.
http
return
this
.
http
.
get
(
this
.
currentApiUrl
+
'/wallet/estimate-txfee'
,
new
RequestOptions
({
headers
:
this
.
headers
,
search
:
params
}))
.
get
(
this
.
currentApiUrl
+
'/
destream
wallet/estimate-txfee'
,
new
RequestOptions
({
headers
:
this
.
headers
,
search
:
params
}))
.
map
((
response
:
Response
)
=>
response
);
.
map
((
response
:
Response
)
=>
response
);
}
}
...
@@ -215,7 +215,7 @@ export class ApiService {
...
@@ -215,7 +215,7 @@ export class ApiService {
buildTransaction
(
data
:
TransactionBuilding
):
Observable
<
any
>
{
buildTransaction
(
data
:
TransactionBuilding
):
Observable
<
any
>
{
return
this
.
http
return
this
.
http
.
post
(
this
.
currentApiUrl
+
'/wallet/build-transaction'
,
JSON
.
stringify
(
data
),
{
headers
:
this
.
headers
})
.
post
(
this
.
currentApiUrl
+
'/
destream
wallet/build-transaction'
,
JSON
.
stringify
(
data
),
{
headers
:
this
.
headers
})
.
map
((
response
:
Response
)
=>
response
);
.
map
((
response
:
Response
)
=>
response
);
}
}
...
...
Breeze.UI/src/app/wallet/send/send.component.html
View file @
7fdf81f5
...
@@ -21,19 +21,19 @@
...
@@ -21,19 +21,19 @@
<div
*
ngIf=
"formErrors.address"
class=
"form-control-feedback"
>
{{ formErrors.address }}
</div>
<div
*
ngIf=
"formErrors.address"
class=
"form-control-feedback"
>
{{ formErrors.address }}
</div>
</div>
</div>
<div
class=
"form-group clearfix"
>
<div
class=
"form-group clearfix"
>
<
!--<label>Transaction Fee</label>--
>
<
label>
Fee Type
</label
>
<!-- fee buttons -->
<!-- fee buttons -->
<!--<div class="radioButtons" ngbRadioGroup name="feeButtons" formControlName="fee">
<div
class=
"radioButtons"
ngbRadioGroup
name=
"feeButtons"
formControlName=
"fee"
>
<label ngbButtonLabel class="btn btn-outline-danger">
<input ngbButton type="radio" value="low">Low/Slow
</label>
<label
ngbButtonLabel
class=
"btn btn-outline-warning mx-2"
>
<label
ngbButtonLabel
class=
"btn btn-outline-warning mx-2"
>
<input ngbButton type="radio" value="
medium">Medium
<input
ngbButton
type=
"radio"
value=
"
Included"
>
Included
</label>
</label>
<label ngbButtonLabel class="btn btn-outline-
success
">
<label
ngbButtonLabel
class=
"btn btn-outline-
danger
"
>
<input ngbButton type="radio" value="
high">High/Fast
<input
ngbButton
type=
"radio"
value=
"
Extra"
>
Extra
</label>
</label>
</div>-->
<!--<label ngbButtonLabel class="btn btn-outline-success">
<input ngbButton type="radio" value="high">High/Fast
</label>-->
</div>
<!-- /fee buttons -->
<!-- /fee buttons -->
<div
class=
"form-group clearfix"
>
<div
class=
"form-group clearfix"
>
<div
*
ngIf=
"estimatedFee"
>
<div
*
ngIf=
"estimatedFee"
>
...
...
Breeze.UI/src/app/wallet/send/send.component.ts
View file @
7fdf81f5
...
@@ -44,7 +44,7 @@ export class SendComponent implements OnInit {
...
@@ -44,7 +44,7 @@ export class SendComponent implements OnInit {
"address"
:
[
""
,
Validators
.
compose
([
Validators
.
required
,
Validators
.
minLength
(
26
)])],
"address"
:
[
""
,
Validators
.
compose
([
Validators
.
required
,
Validators
.
minLength
(
26
)])],
// "amount": ["", Validators.compose([Validators.required, Validators.pattern(/^[0-9]+(\.[0-9]{0,8})?$/)])],
// "amount": ["", Validators.compose([Validators.required, Validators.pattern(/^[0-9]+(\.[0-9]{0,8})?$/)])],
"amount"
:
[
""
,
Validators
.
compose
([
Validators
.
required
,
Validators
.
pattern
(
/^
([
0-9
]
+
)?(\.[
0-9
]{0,8})?
$/
)])],
"amount"
:
[
""
,
Validators
.
compose
([
Validators
.
required
,
Validators
.
pattern
(
/^
([
0-9
]
+
)?(\.[
0-9
]{0,8})?
$/
)])],
"fee"
:
[
"
medium
"
,
Validators
.
required
],
"fee"
:
[
"
Included
"
,
Validators
.
required
],
"password"
:
[
""
,
Validators
.
required
]
"password"
:
[
""
,
Validators
.
required
]
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment