Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
wallet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
8
Issues
8
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
hive
wallet
Commits
f73bca6e
Commit
f73bca6e
authored
Apr 23, 2020
by
Bartłomiej Górnicki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'autoclave'
# Conflicts: # src/app/components/modules/UserWallet.jsx
parents
378892ff
439dc5b0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
src/app/redux/TransactionReducer.js
src/app/redux/TransactionReducer.js
+17
-1
src/server/api/general.js
src/server/api/general.js
+1
-1
No files found.
src/app/redux/TransactionReducer.js
View file @
f73bca6e
...
...
@@ -56,11 +56,27 @@ export default function reducer(state = defaultState, action) {
let
errorStr
=
error
.
toString
();
let
errorKey
=
'
Transaction broadcast error.
'
;
for
(
const
[
type
/*, operation*/
]
of
operations
)
{
for
(
const
[
type
,
operation
]
of
operations
)
{
switch
(
type
)
{
case
'
transfer
'
:
if
(
/get_balance/
.
test
(
errorStr
))
{
errorKey
=
'
Insufficient balance.
'
;
}
else
{
for
(
let
ei
=
0
;
ei
<
error
.
data
.
stack
.
length
;
ei
+=
1
)
{
const
errorStackItem
=
error
.
data
.
stack
[
ei
];
if
(
errorStackItem
.
data
.
name
===
operation
.
to
&&
errorStackItem
.
data
.
what
===
'
unknown key
'
)
{
errorKey
=
'
Unknown recipient
'
;
break
;
}
}
}
break
;
case
'
withdraw_vesting
'
:
...
...
src/server/api/general.js
View file @
f73bca6e
...
...
@@ -147,7 +147,7 @@ export default function useGeneralApi(app) {
// const existing_created_account = yield models.Account.findOne({
// attributes: ['id'],
// where: {user_id, ignored: false, created: true},
// order:
'id DESC'
// order:
[['id', 'DESC']]
// });
// if (existing_created_account) {
// throw new Error("Only one Hive account per user is allowed in order to prevent abuse");
...
...
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