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
8163aaca
Commit
8163aaca
authored
Sep 20, 2017
by
Pieterjan Vanhoof
Committed by
GitHub
Sep 20, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #224 from stratisproject/ui
Remove package-lock and add blank pop up workaround
parents
a8af8ff5
af74d078
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
10777 deletions
+48
-10777
.gitignore
.gitignore
+1
-0
package-lock.json
Breeze.UI/package-lock.json
+0
-10768
dashboard.component.ts
Breeze.UI/src/app/wallet/dashboard/dashboard.component.ts
+29
-6
history.component.ts
Breeze.UI/src/app/wallet/history/history.component.ts
+18
-3
No files found.
.gitignore
View file @
8163aaca
...
...
@@ -248,6 +248,7 @@ ModelManifest.xml
# dependencies
**/node_modules
package-lock.json
# IDEs and editors
/.idea
...
...
Breeze.UI/package-lock.json
deleted
100644 → 0
View file @
a8af8ff5
This diff is collapsed.
Click to expand it.
Breeze.UI/src/app/wallet/dashboard/dashboard.component.ts
View file @
8163aaca
...
...
@@ -28,13 +28,11 @@ export class DashboardComponent implements OnInit {
private
walletHistorySubscription
:
Subscription
;
ngOnInit
()
{
this
.
getWalletBalance
();
this
.
getHistory
();
this
.
startSubscriptions
();
};
ngOnDestroy
()
{
this
.
walletBalanceSubscription
.
unsubscribe
();
this
.
walletHistorySubscription
.
unsubscribe
();
this
.
cancelSubscriptions
();
};
private
openSendDialog
()
{
...
...
@@ -70,7 +68,12 @@ export class DashboardComponent implements OnInit {
console
.
log
(
error
);
}
else
{
alert
(
error
.
json
().
errors
[
0
].
description
);
if
(
error
.
json
().
errors
[
0
].
description
)
{
alert
(
error
.
json
().
errors
[
0
].
description
);
}
else
{
this
.
cancelSubscriptions
();
this
.
startSubscriptions
();
}
}
}
}
...
...
@@ -98,11 +101,31 @@ export class DashboardComponent implements OnInit {
console
.
log
(
error
);
}
else
{
alert
(
error
.
json
().
errors
[
0
].
description
);
if
(
error
.
json
().
errors
[
0
].
description
)
{
alert
(
error
.
json
().
errors
[
0
].
description
);
}
else
{
this
.
cancelSubscriptions
();
this
.
startSubscriptions
();
}
}
}
}
)
;
};
private
cancelSubscriptions
()
{
if
(
this
.
walletBalanceSubscription
)
{
this
.
walletBalanceSubscription
.
unsubscribe
();
}
if
(
this
.
walletHistorySubscription
)
{
this
.
walletHistorySubscription
.
unsubscribe
();
}
};
private
startSubscriptions
()
{
this
.
getWalletBalance
();
this
.
getHistory
();
}
}
Breeze.UI/src/app/wallet/history/history.component.ts
View file @
8163aaca
...
...
@@ -25,11 +25,11 @@ export class HistoryComponent {
private
walletHistorySubscription
:
Subscription
;
ngOnInit
()
{
this
.
getHistory
();
this
.
startSubscriptions
();
}
ngOnDestroy
()
{
this
.
walletHistorySubscription
.
unsubscribe
();
this
.
cancelSubscriptions
();
}
private
openTransactionDetailDialog
(
transaction
:
any
)
{
...
...
@@ -57,11 +57,26 @@ export class HistoryComponent {
console
.
log
(
error
);
}
else
{
alert
(
error
.
json
().
errors
[
0
].
description
);
if
(
error
.
json
().
errors
[
0
].
description
)
{
alert
(
error
.
json
().
errors
[
0
].
description
);
}
else
{
this
.
cancelSubscriptions
();
this
.
startSubscriptions
();
}
}
}
}
)
;
};
private
cancelSubscriptions
()
{
if
(
this
.
walletHistorySubscription
)
{
this
.
walletHistorySubscription
.
unsubscribe
();
}
};
private
startSubscriptions
()
{
this
.
getHistory
();
}
}
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