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
2f348fc7
Commit
2f348fc7
authored
Oct 27, 2017
by
Pieterjan Vanhoof
Committed by
GitHub
Oct 27, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #340 from stratisproject/ui
Adjust recovery error message, allow amounts without a leading zero
parents
b3bf70e0
41384343
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
recover.component.ts
Breeze.UI/src/app/setup/recover/recover.component.ts
+1
-1
send.component.ts
Breeze.UI/src/app/wallet/send/send.component.ts
+2
-2
No files found.
Breeze.UI/src/app/setup/recover/recover.component.ts
View file @
2f348fc7
...
@@ -178,7 +178,7 @@ export class RecoverComponent implements OnInit {
...
@@ -178,7 +178,7 @@ export class RecoverComponent implements OnInit {
private
AlertIfNeeded
(
bitcoinErrorMessage
:
string
,
stratisErrorMessage
:
string
)
{
private
AlertIfNeeded
(
bitcoinErrorMessage
:
string
,
stratisErrorMessage
:
string
)
{
if
(
bitcoinErrorMessage
!==
""
||
stratisErrorMessage
!==
""
)
{
if
(
bitcoinErrorMessage
!==
""
||
stratisErrorMessage
!==
""
)
{
let
errorMessage
=
"
Bitcoin wallet recovery:
\n
"
+
bitcoinErrorMessage
+
"
\n\n
Stratis wallet recovery:
\n
"
+
stratisErrorMessage
;
let
errorMessage
=
"
<strong>Bitcoin wallet recovery:</strong><br>"
+
bitcoinErrorMessage
+
"<br><br><strong>Stratis wallet recovery:</strong><br>
"
+
stratisErrorMessage
;
this
.
genericModalService
.
openModal
(
null
,
errorMessage
);
this
.
genericModalService
.
openModal
(
null
,
errorMessage
);
}
}
}
}
...
...
Breeze.UI/src/app/wallet/send/send.component.ts
View file @
2f348fc7
...
@@ -39,8 +39,8 @@ export class SendComponent implements OnInit {
...
@@ -39,8 +39,8 @@ export class SendComponent implements OnInit {
private
buildSendForm
():
void
{
private
buildSendForm
():
void
{
this
.
sendForm
=
this
.
fb
.
group
({
this
.
sendForm
=
this
.
fb
.
group
({
"address"
:
[
""
,
Validators
.
required
],
"address"
:
[
""
,
Validators
.
required
],
"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"
:
[
"medium"
,
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