Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
921c500
New BitShares EOS option in Deposit & Withdraw
szechem Oct 9, 2018
98daf66
Modal of eos bitshares
szechem Oct 10, 2018
490d751
Add amount selector and remove one modal
szechem Oct 11, 2018
bb8cb77
Add checkbox for creating account
szechem Oct 11, 2018
9dd8e5b
Add maintenance modal
szechem Oct 12, 2018
8fcc37c
Memo customization
szechem Oct 15, 2018
3669ea9
Initial validation for BEOS account
szechem Oct 16, 2018
a07cdb1
Implementation of BEOS account validation
szechem Oct 17, 2018
d908e45
Change account exist error desc
szechem Oct 18, 2018
aa4ae44
Alt react back to older version
szechem Oct 24, 2018
76b6cc6
Fee calculation
szechem Oct 25, 2018
4bbe5cc
Uncomment code needed to make app working correctly
szechem Oct 29, 2018
81b9cf4
Add Bitshares EOS description
szechem Oct 30, 2018
fc807b7
Change limitation for creating account
szechem Nov 7, 2018
b62ff91
Fix validation order
szechem Nov 8, 2018
59d2b51
Change fee for creating account if less then 12 symbols
szechem Nov 9, 2018
1e09b18
Remove console.log
szechem Nov 12, 2018
fe9544c
Allow to test
szechem Nov 16, 2018
66870e1
Minor changes
szechem Nov 16, 2018
39d1c9f
Change validation address and enable submit button
szechem Nov 19, 2018
92c9616
handle query params for beos withdraw
Nov 22, 2018
88ec63b
Validation improvement
szechem Nov 22, 2018
dfa2a06
update dockerfile
Nov 22, 2018
2fcb56d
Remove unused code
szechem Nov 23, 2018
e218668
Fix conflicts
szechem Nov 27, 2018
27928e2
Reimplementation of dialogs after merge
szechem Nov 27, 2018
1cbd042
BEOS text improvements
szechem Dec 3, 2018
583d063
Update beos issuer account
szechem Dec 4, 2018
f14862c
Handle delayed account validation
Dec 13, 2018
47f6ea3
allow up to 4 decimal place
Dec 13, 2018
9ad2d85
handle pending accounts on beos modal
Dec 17, 2018
5c9b30d
Add brownie.pts to beos dialog
Dec 20, 2018
65ea368
Text improvements
szechem Jan 3, 2019
f4f13bf
Handle if user haven't any balance for given user
Jan 7, 2019
9bcc0cb
Disable submit on account creation
szechem Jan 8, 2019
37172ce
fix fee amount on select max value for asset
Jan 9, 2019
ce1d03c
Fixes after merge
szechem Jan 9, 2019
e002c55
ensure asset balance is exist
Jan 10, 2019
a340626
Update package lock json file
szechem Jan 10, 2019
48d1c52
Beos validation address update
szechem Jan 28, 2019
c59e039
Resolve conflicts
szechem Jan 29, 2019
39d0f27
Checking balance improvement
szechem Jan 29, 2019
1aed868
Limit to four places after dot in beos account amount input
szechem Jan 30, 2019
366ce97
Merge remote-tracking branch 'upstream/develop' into beos_dialog
szechem Feb 8, 2019
c752f15
Merge remote-tracking branch 'upstream/develop' into beos_dialog
szechem Feb 13, 2019
cfe83be
Merge remote-tracking branch 'upstream/develop' into beos_dialog
szechem Feb 19, 2019
9a3759a
Resolve conflicts
motrebski Mar 15, 2019
a03a0d8
Set fee as 500 BTS
motrebski Mar 18, 2019
38c6b00
Update BEOS text
szechem Apr 2, 2019
ee809bc
Update text
szechem Apr 2, 2019
1b1cc25
Update text
szechem Apr 2, 2019
6fdd1e8
Change trustees to directors
motrebski Apr 3, 2019
f09220e
Introduce multi sig error
motrebski Apr 3, 2019
18688eb
Disable button if multisig error is appeared
motrebski Apr 4, 2019
811fa84
Fix multisig error
motrebski Apr 4, 2019
8ce537a
Update multisig error
motrebski Apr 4, 2019
986b9a7
Update multisig error
motrebski Apr 4, 2019
f886f64
Memo fix
motrebski Apr 8, 2019
f7df8d0
Fix memo create removing issue
motrebski Apr 9, 2019
ea904cc
Display error if gateway is failed
motrebski Apr 18, 2019
3eaa0cd
Fix validation
motrebski Apr 25, 2019
bc9060c
Update scamAccounts file
motrebski Apr 29, 2019
d5ba687
Getting data from request
motrebski Jul 8, 2019
5f7cb02
Clean up
motrebski Jul 9, 2019
cb16b37
get coins from api
Jul 9, 2019
06dd8f4
update memo creation
Jul 9, 2019
89d37eb
add wrapper
motrebski Jul 9, 2019
f67de65
update bitshares modal
Jul 9, 2019
563fe72
Fix conflicts after merge
motrebski Jul 9, 2019
9d6e349
Remove console.log
motrebski Jul 9, 2019
66f8c01
Restore dockerfile
motrebski Jul 12, 2019
21c8b98
Generic Beos UI
motrebski Jul 19, 2019
8f26043
Fix gateway message bug
motrebski Jul 22, 2019
dbe31bf
Fix multisig error
motrebski Aug 19, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/api/apiConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ export const xbtsxAPIs = {
COINS_LIST: "/coin"
};

export const beosAPIs = {
BASE: "https://gateway.beos.world/api/v2",
COINS_LIST: "/coins",
TRADING_PAIRS: "/trading-pairs"
};

export const nodeRegions = [
// region of the node follows roughly https://en.wikipedia.org/wiki/Subregion#/media/File:United_Nations_geographical_subregions.png
"Northern Europe",
Expand Down
19 changes: 19 additions & 0 deletions app/assets/locales/locale-en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1115,6 +1115,25 @@
"status": "Status",
"support_block": "For DEPOSIT AND WITHDRAWAL issues using \"OpenLedger TRANSFER SERVICE\", please contact Openledger at:",
"support_gdex": "For support, please contact GDEX",
"bitshares_beos": {
"account_label": "Bitshares EOS account",
"account_validation_label": "Please wait, validating address...",
"amount_to_send_label": "Amount to send to BEOS account",
"account_validation_error": "Illegal BEOS account name: account must have less then 13 symbols (a-z lower case only, 1-5 and . not at the end are allowed)",
"create_account_checkbox": "Create BitShares EOS account",
"beos_conversion": "Convert to %(name)s",
"send_button_label": "Send",
"transfer_button_label": "Transfer BTS to BitShares EOS account",
"modal_title": "Transfer BTS to BitShares EOS account",
"maintenance_modal_label": "Gateway to BitShares EOS is down for maintenance",
"maintenance_error": "Gateway to BitShares EOS is down for maintenance",
"maintenance_button_label": "Ok",
"memo_label": "Memo (optional)",
"no_account_error": "BEOS account doesn't exist, create it by paying an additional %(btsAmount)s BTS. This new account will be controlled by the same keys as your BitShares account.",
"account_creation_pending": "This account is currently in the stage of creation.",
"no_account_error_without_creation": "BEOS account doesn't exist, to create it please select BTS as an asset.",
"multi_sig_error": "Current BTS account is multi-sig, so it cannot create a BEOS account."
},
"symbol": "Symbol",
"time": "Time",
"title": "Deposit & Withdraw",
Expand Down
13 changes: 13 additions & 0 deletions app/components/Account/AccountDepositWithdraw.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import AccountStore from "stores/AccountStore";
import SettingsStore from "stores/SettingsStore";
import SettingsActions from "actions/SettingsActions";
import {openledgerAPIs} from "api/apiConfig";
import BitsharesBeos from "../DepositWithdraw/BitsharesBeos";
import BitKapital from "../DepositWithdraw/BitKapital";
import RuDexGateway from "../DepositWithdraw/rudex/RuDexGateway";
import GatewayStore from "stores/GatewayStore";
Expand Down Expand Up @@ -495,6 +496,17 @@ class AccountDepositWithdraw extends React.Component {
)
});

serList.push({
name: "BitShares EOS",
template: (
<BitsharesBeos
account={account}
asset={"BTS"}
params={this.props.location}
/>
)
});

serList.push({
name: "BitKapital",
template: (
Expand Down Expand Up @@ -582,6 +594,7 @@ class AccountDepositWithdraw extends React.Component {
"RUDEX",
"SPARKDEX",
"TRADE",
"BEOS",
"BITKAPITAL",
"XBTSX",
"CITADEL"
Expand Down
8 changes: 4 additions & 4 deletions app/components/Account/Proposals.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ class Proposals extends Component {

componentDidMount() {
/*
* Account objects don't get updated by underlying proposal changes, but
* the ChainStore does, so in order to update this component when a proposal
* changes, we need to update it whenever the ChainStore itself updates
*/
* Account objects don't get updated by underlying proposal changes, but
* the ChainStore does, so in order to update this component when a proposal
* changes, we need to update it whenever the ChainStore itself updates
*/
ChainStore.subscribe(this.forceUpdate);
}

Expand Down
Loading