From bb75840a9e25d5e7268ef69c414f46dcc9087ec6 Mon Sep 17 00:00:00 2001 From: Rishi Panthee Date: Fri, 16 Oct 2020 12:12:43 -0500 Subject: [PATCH 01/11] Works with hive again --- app/actions/account.js | 18 ++++++------------ app/actions/keys.js | 2 ++ app/app.html | 2 +- app/components/Accounts/Delegation.js | 4 ++-- app/components/Send.js | 18 ++++++------------ app/components/Transactions/Balances.js | 6 +++--- app/components/Transactions/PendingRewards.js | 8 ++++---- .../Vesting/CancelPowerDownPrompt.js | 4 ++-- app/components/Vesting/PowerDownPrompt.js | 6 +++--- app/components/VestingAccounts.js | 2 +- app/components/global/AccountAvatar.js | 2 +- app/components/sign/operations/fields/asset.js | 4 ++-- app/components/sign/operations/fields/vests.js | 4 ++-- .../sign/operations/types/delegation.js | 2 +- app/package-lock.json | 2 +- app/package.json | 2 +- package.json | 4 ++-- 17 files changed, 40 insertions(+), 50 deletions(-) diff --git a/app/actions/account.js b/app/actions/account.js index ffb1102..91c6923 100644 --- a/app/actions/account.js +++ b/app/actions/account.js @@ -62,20 +62,20 @@ export const ACCOUNT_TRANSFER_TO_SAVINGS_COMPLETED = 'ACCOUNT_TRANSFER_TO_SAVING export const ACCOUNT_CONTACTS_ADD = 'ACCOUNT_CONTACTS_ADD'; export const ACCOUNT_CONTACTS_REMOVE = 'ACCOUNT_CONTACTS_REMOVE'; +hive.config.set('rebranded_api', true) +hive.broadcast.updateOperations() + export function claimRewardBalance(wif: string, params: object) { return (dispatch: () => void) => { const { account, reward_hive, reward_hbd, reward_vests } = params; - let reward_steem = reward_hive.replace("HIVE", "STEEM"); - let reward_sbd = reward_hbd.replace("HBD", "SBD"); const ops = [ ['claim_reward_balance', { account, - reward_steem, - reward_sbd, + reward_hive, + reward_hbd, reward_vests }] ]; - console.error(JSON.stringify(ops)) hive.broadcast.send({ operations: ops, extensions: [] @@ -267,8 +267,6 @@ export function refreshAccountData(accounts: Array) { export function transfer(wif, params) { return (dispatch: () => void) => { var { from, to, amount, memo } = params; - amount = amount.replace("HIVE", "STEEM"); - amount = amount.replace("HBD", "SBD"); dispatch({ type: ACCOUNT_TRANSFER_STARTED }); @@ -297,8 +295,6 @@ export function transferCompleted() { export function transferFromSavings(wif, params) { return (dispatch: () => void) => { var { from, requestId, to, amount, memo } = params; - amount = amount.replace("HIVE", "STEEM"); - amount = amount.replace("HBD", "SBD"); dispatch({ type: ACCOUNT_TRANSFER_FROM_SAVINGS_STARTED }); @@ -327,8 +323,6 @@ export function transferFromSavingsCompleted() { export function transferToSavings(wif, params) { return (dispatch: () => void) => { var { from, to, amount, memo } = params; - amount = amount.replace("HIVE", "STEEM"); - amount = amount.replace("HBD", "SBD"); dispatch({ type: ACCOUNT_TRANSFER_TO_SAVINGS_STARTED }); @@ -521,7 +515,7 @@ export function cancelWithdrawVesting(wif, params) { export function powerUp(wif, params) { return (dispatch: () => void) => { const { from_account, to_account, hiveAmount } = params; - const hiveFormat = [hiveAmount, "STEEM"].join(" "); + const hiveFormat = [hiveAmount, "HIVE"].join(" "); dispatch({ type: ACCOUNT_POWER_UP_STARTED }); diff --git a/app/actions/keys.js b/app/actions/keys.js index 69dadfc..2763ab9 100644 --- a/app/actions/keys.js +++ b/app/actions/keys.js @@ -35,6 +35,8 @@ export const KEY_ADD_PROMPT = 'KEY_ADD_PROMPT'; export const KEY_CREATE_CANCEL = 'KEY_CREATE_CANCEL'; export const KEY_CREATE_PROMPT = 'KEY_CREATE_PROMPT'; +hive.config.set('rebranded_api', true) +hive.broadcast.updateOperations() export function addKey(account: string, wif: string) { const isValidKey = hive.auth.isWif(wif); diff --git a/app/app.html b/app/app.html index 6cd81f2..305e375 100644 --- a/app/app.html +++ b/app/app.html @@ -2,7 +2,7 @@ - Vessel - 0.4.6 + Vessel - 0.5.0