conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
$state,
=======
$scope,
>>>>>>>
$scope,
$state,
<<<<<<<
historyStore,
notification,
orgUnitStore,
=======
>>>>>>>
historyStore,
notification,
<<<<<<<
'$state',
=======
'$scope',
>>>>>>>
'$scope',
'$state',
<<<<<<<
'HistoryStore',
'Notification',
'OrgUnitStore',
=======
>>>>>>>
'HistoryStore',
'Notification', |
<<<<<<<
import {amber, green, red, grey} from "../../../common/colors";
import {findNonConcreteDataTypeIds, findDeprecatedDataTypeIds, findUnknownDataTypeId} from '../../../data-types/data-type-utils';
=======
import {green, red} from "../../../common/colors";
import {findUnknownDataType} from "../../../data-types/data-type-utils";
>>>>>>>
import {amber, green, red, grey} from "../../../common/colors";
import {findNonConcreteDataTypeIds, findDeprecatedDataTypeIds, findUnknownDataTypeId} from "../../../data-types/data-type-utils";
<<<<<<<
if(d.data.key === 'VALID') {
return color(green);
} else if (d.data.key === 'DEPRECATED') {
return color(amber);
} else if (d.data.key === 'NON CONCRETE') {
return color(grey);
} else {
return color(red);
}
=======
return d.key === "KNOWN"
? color(green)
: color(red);
>>>>>>>
if(d.data.key === "VALID") {
return color(green);
} else if (d.data.key === "DEPRECATED") {
return color(amber);
} else if (d.data.key === "NON CONCRETE") {
return color(grey);
} else {
return color(red);
} |
<<<<<<<
const paramsDetect = require('./../../ast/paramsDetect');
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
this.register('template-parse-ast-attr-v-bind', function parseAstBind (item, name, value, modifiers, scope) {
return {
name: name,
prop: name.replace(bindRE, ''),
value: value,
expr: `{{ ${value} }}`
};
});
/*
this.register('template-parse-ast-attr-v-on', function parseAstOn (item, evt, handler, modifiers, scope) {
evt = evt.replace(onRE, '');
let info = parseHandler(evt, handler, modifiers, scope);
let parsed = {};
info.params.forEach((p, i) => {
let paramAttr = 'data-wpy' + info.event.toLowerCase() + '-' + String.fromCharCode(97 + i);
if (paramAttr.length > 31) {
this.logger.warn(`Function name is too long, it may cause an Error. "${info.handler}"`);
}
parsed[paramAttr] = `{{ ${p} }}`;
});
parsed[info.type] = '_proxy';
info.parsed = parsed;
return info;
});
*/
const ATTR_HANDLERS = {
'v-for': ({item, name, expr, modifiers, scope}) => {
let res = {};
let currentScope = {};
let inMatch = expr.match(forAliasRE);
let variableMatch = expr.match(variableRE);
currentScope.expr = expr;
if (variableMatch) {
// e.g: v-for="items"
res.alias = 'item';
res.for = variableMatch[0].trim();
currentScope.for = res.for;
currentScope.declared = [];
}
if (inMatch) {
currentScope.declared = currentScope.declared || [];
res.for = inMatch[2].trim();
currentScope.for = res.for;
let alias = inMatch[1].trim().replace(stripParensRE, '');
let iteratorMatch = alias.match(forIteratorRE);
if (iteratorMatch) {
res.alias = alias.replace(forIteratorRE, '').trim();
currentScope.declared.push(res.alias);
currentScope.alias = res.alias;
res.iterator1 = iteratorMatch[1].trim();
currentScope.iterator1 = res.iterator1;
currentScope.declared.push(res.iterator1);
if (iteratorMatch[2]) {
res.iterator2 = iteratorMatch[2].trim();
currentScope.iterator2 = res.iterator2;
currentScope.declared.push(res.iterator2);
}
} else {
res.alias = alias;
currentScope.alias = alias;
currentScope.declared.push(alias);
}
}
if (scope) {
currentScope.parent = scope;
if (!scope.parent)
currentScope.root = scope;
else {
currentScope.root = scope.root;
}
}
return {
scope: currentScope,
attrs: {
'wx:for': `{{ ${res.for} }}`,
'wx:for-index': `${res.iterator1 || 'index'}`,
'wx:for-item': `${res.alias || 'item'}`,
'wx:key': `${res.iterator2 || res.iterator1 || 'index'}`
}
};
},
'v-show': ({item, name, expr}) => ({attrs: { hidden: `{{ !(${expr}) }}` }}),
'v-if': ({item, name, expr}) => ({attrs: { 'wx:if': `{{ ${expr} }}` }}),
'v-else-if': ({item, name, expr}) => ({attrs: { 'wx:elif': `{{ ${expr} }}` }}),
'v-else': ({item, name, expr}) => ({attrs: { 'wx:else': true }})
};
for (let name in ATTR_HANDLERS) {
this.register('template-parse-ast-attr-' + name, ATTR_HANDLERS[name]);
}
this.register('template-parse-ast-attr', function parseAstAttr (item, scope, rel) {
=======
this.register('template-parse-ast-attr', function parseAstAttr (item, scope, rel, ctx) {
>>>>>>>
this.register('template-parse-ast-attr', function parseAstAttr (item, scope, rel, ctx) { |
<<<<<<<
if (me.currentChild) {
me.currentChild.hidePage(function () { });
if (!me.currentChild.isStartPage()) {
me.currentChild = null;
=======
var currentChild = me.currentChildO();
if (currentChild) {
if (!currentChild.isStartPage()) {
currentChild.hidePage(function () {
});
>>>>>>>
var currentChild = me.currentChildO();
if (currentChild) {
currentChild.hidePage(function () {});
if (!currentChild.isStartPage()) {
<<<<<<<
me.showElementWrapper();
if (me.route) {
me.childManager.showChild(me.route);
}
=======
// what is signaling if a page is active or not?
if (me.route) {
me.childManager.showChild(me.route);
}
>>>>>>>
me.showElementWrapper();
// what is signaling if a page is active or not?
if (me.route) {
me.childManager.showChild(me.route);
}
<<<<<<<
else {
me.showElementWrapper(callback);
}
=======
};
p.titleOrId = function() {
return this.val('title') || this.id();
>>>>>>>
else {
me.showElementWrapper(callback);
}
};
p.titleOrId = function() {
return this.val('title') || this.id(); |
<<<<<<<
import autoComplete from './autoCompleteReducer';
=======
import showSuccessToast from './showSuccessToastReducer';
>>>>>>>
import autoComplete from './autoCompleteReducer';
import showSuccessToast from './showSuccessToastReducer';
<<<<<<<
createPursuance,
autoComplete
=======
createPursuance,
showSuccessToast
>>>>>>>
createPursuance,
autoComplete,
showSuccessToast |
<<<<<<<
import fetchTransactions from '~/routes/safe/store/actions/fetchTransactions'
=======
import updateSafe from '~/routes/safe/store/actions/updateSafe'
>>>>>>>
import fetchTransactions from '~/routes/safe/store/actions/fetchTransactions'
import updateSafe from '~/routes/safe/store/actions/updateSafe'
<<<<<<<
fetchTransactions: typeof fetchTransactions,
=======
updateSafe: typeof updateSafe,
>>>>>>>
fetchTransactions: typeof fetchTransactions,
updateSafe: typeof updateSafe,
<<<<<<<
fetchTransactions,
=======
updateSafe,
>>>>>>>
fetchTransactions,
updateSafe, |
<<<<<<<
const SUCCESS_MSG = 'Wallet connected sucessfully'
const UNLOCK_MSG = 'Unlock your wallet to connect'
const WRONG_NETWORK = `You are connected to wrong network. Please use ${getNetwork()}`
export const WALLET_ERROR_MSG = 'Error connecting to your wallet'
const handleProviderNotification = (openSnackbar: Function, provider: ProviderProps) => {
=======
const handleProviderNotification = (
dispatch: ReduxDispatch<*>,
provider: ProviderProps,
enqueueSnackbar: Function,
closeSnackbar: Function,
) => {
>>>>>>>
const handleProviderNotification = (
provider: ProviderProps,
enqueueSnackbar: Function,
closeSnackbar: Function,
) => {
<<<<<<<
if (ETHEREUM_NETWORK_IDS[network] !== getNetwork()) {
openSnackbar(WRONG_NETWORK, 'error')
=======
if (ETHEREUM_NETWORK_IDS[network] !== ETHEREUM_NETWORK.RINKEBY) {
showSnackbar(NOTIFICATIONS.WRONG_NETWORK_RINKEBY_MSG, enqueueSnackbar, closeSnackbar)
>>>>>>>
if (ETHEREUM_NETWORK_IDS[network] !== getNetwork()) {
showSnackbar(NOTIFICATIONS.WRONG_NETWORK_MSG, enqueueSnackbar, closeSnackbar) |
<<<<<<<
if(Meteor.isServer && !!getSetting('emailNotifications', true)){
// we don't want emails to hold up the post submission, so we make the whole thing async with setTimeout
Meteor.setTimeout(function () {
newPostNotification(post, [post.userId])
}, 1);
=======
if(Meteor.isServer && !!getSetting('emailNotifications', false)){
var userIds = Meteor.users.find({'profile.notifications.posts': 1}, {fields: {}}).map(function (user) {
return user._id
});
Herald.createNotification(userIds, {courier: 'newPost', data: post})
>>>>>>>
if(Meteor.isServer && !!getSetting('emailNotifications', true)){
var userIds = Meteor.users.find({'profile.notifications.posts': 1}, {fields: {}}).map(function (user) {
return user._id
});
Herald.createNotification(userIds, {courier: 'newPost', data: post}) |
<<<<<<<
, ModelBuilder = require('loopback-datasource-juggler').ModelBuilder
, assert = require('assert')
, i8n = require('inflection')
, merge = require('util')._extend;
=======
, assert = require('assert');
>>>>>>>
, ModelBuilder = require('loopback-datasource-juggler').ModelBuilder
, i8n = require('inflection')
, merge = require('util')._extend;
, assert = require('assert'); |
<<<<<<<
if (this._refreshTargets) this.emit(Runtime.TARGETS_UPDATE);
// @todo(vm#570) only emit if monitors has changed since last time.
this.emit(Runtime.MONITORS_UPDATE,
Object.keys(this._monitorState).map(key => this._monitorState[key])
);
}
/**
* Get the number of threads in the given array that are monitor threads (threads
* that update monitor values, and don't count as running a script).
* @param {!Array.<Thread>} threads The set of threads to look through.
* @return {number} The number of monitor threads in threads.
*/
_getMonitorThreadCount (threads) {
let count = 0;
threads.forEach(thread => {
if (thread.updateMonitor) count++;
});
return count;
=======
if (this._refreshTargets) {
this.emit(Runtime.TARGETS_UPDATE);
this._refreshTargets = false;
}
>>>>>>>
if (this._refreshTargets) {
this.emit(Runtime.TARGETS_UPDATE);
this._refreshTargets = false;
}
// @todo(vm#570) only emit if monitors has changed since last time.
this.emit(Runtime.MONITORS_UPDATE,
Object.keys(this._monitorState).map(key => this._monitorState[key])
);
}
/**
* Get the number of threads in the given array that are monitor threads (threads
* that update monitor values, and don't count as running a script).
* @param {!Array.<Thread>} threads The set of threads to look through.
* @return {number} The number of monitor threads in threads.
*/
_getMonitorThreadCount (threads) {
let count = 0;
threads.forEach(thread => {
if (thread.updateMonitor) count++;
});
return count; |
<<<<<<<
// Create extension set to hold extension ids found while serializing targets
const extensions = new Set();
const flattenedOriginalTargets = JSON.parse(JSON.stringify(
=======
const flattenedOriginalTargets = JSON.parse(JSON.stringify(targetId ?
[runtime.getTargetById(targetId)] :
>>>>>>>
// Create extension set to hold extension ids found while serializing targets
const extensions = new Set();
const flattenedOriginalTargets = JSON.parse(JSON.stringify(targetId ?
[runtime.getTargetById(targetId)] :
<<<<<<<
obj.targets = flattenedOriginalTargets.map(t => serializeTarget(t, extensions));
=======
const serializedTargets = flattenedOriginalTargets.map(t => serializeTarget(t, runtime));
if (targetId) {
return serializedTargets[0];
}
obj.targets = serializedTargets;
>>>>>>>
const serializedTargets = flattenedOriginalTargets.map(t => serializeTarget(t, extensions));
if (targetId) {
return serializedTargets[0];
}
obj.targets = serializedTargets; |
<<<<<<<
import SwitcherDemo from './switcher/demo';
=======
import TableDemo from './table/demo';
>>>>>>>
import SwitcherDemo from './switcher/demo';
import TableDemo from './table/demo'; |
<<<<<<<
import iconWarning from '../assets/images/icons-v2/icon-warning.svg';
=======
import iconLoader from '../assets/images/icons-v2/icon-loader-16.svg';
>>>>>>>
import iconWarning from '../assets/images/icons-v2/icon-warning.svg';
import iconLoader from '../assets/images/icons-v2/icon-loader-16.svg';
<<<<<<<
iconWarning,
=======
iconLoader,
>>>>>>>
iconWarning,
iconLoader, |
<<<<<<<
import { withTranslation } from 'react-i18next';
import { bookmarkAdded, bookmarkRemoved } from '../../../actions/bookmarks';
=======
import { translate } from 'react-i18next';
import { bookmarkAdded, bookmarkRemoved, bookmarkUpdated } from '../../../actions/bookmarks';
>>>>>>>
import { withTranslation } from 'react-i18next';
import { bookmarkAdded, bookmarkRemoved, bookmarkUpdated } from '../../../actions/bookmarks'; |
<<<<<<<
filterAll: '.filter-all',
filterOutgoing: '.filter-out',
filterIncoming: '.filter-in',
filterVoted: '.filter-voted',
filterNotVoted: '.filter-not-voted',
=======
filterAll: '.filter-all',
filterOutgoing: '.filter-out',
filterIncoming: '.filter-in',
>>>>>>>
filterAll: '.filter-all',
filterOutgoing: '.filter-out',
filterIncoming: '.filter-in',
filterVoted: '.filter-voted',
filterNotVoted: '.filter-not-voted',
<<<<<<<
transferSendTab: '.send-tab',
transferRequestTab: '.request-tab',
requestSpecificAmountBtn: '.specify-request',
confirmRequestBtn: '.confirm-request',
qrCode: '.qr-code',
emailLink: '.email-link',
confirmRequestBlock: '.confirm-request-step',
=======
requestSpecificAmountBtn: '.specify-request',
requestLink: '.request-link',
emailLink: '.email-link',
backButton: '.back',
>>>>>>>
transferSendTab: '.send-tab',
transferRequestTab: '.request-tab',
requestSpecificAmountBtn: '.specify-request',
confirmRequestBtn: '.confirm-request',
qrCode: '.qr-code',
emailLink: '.email-link',
confirmRequestBlock: '.confirm-request-step',
requestLink: '.request-link',
backButton: '.back',
<<<<<<<
priceChart: '.chartjs-size-monitor',
=======
transactionRequestButton: '.tx-receive-bt',
transactionSendButton: '.tx-send-bt',
>>>>>>>
priceChart: '.chartjs-size-monitor',
transactionRequestButton: '.tx-receive-bt',
transactionSendButton: '.tx-send-bt', |
<<<<<<<
import i18n from './i18n';
import buildMenu from './menu';
import autoUpdater from './autoUpdater';
=======
import win from './modules/win';
import localeHandler from './modules/localeHandler';
const { app, ipcMain } = electron;
>>>>>>>
import win from './modules/win';
import localeHandler from './modules/localeHandler';
import autoUpdater from './autoUpdater';
const { app, ipcMain } = electron;
<<<<<<<
getConfig();
});
autoUpdater(app);
=======
localeHandler.send({ storage });
});
>>>>>>>
localeHandler.send({ storage });
});
autoUpdater(app); |
<<<<<<<
const retrieveNextForgers = async (network) => {
const { data } = await getForgers({
=======
const retrieveNextForgers = async (getState, forgedInRound) => {
const { network } = getState();
const numberOfRemainingBlocksInRound = 103
- forgedInRound;
const nextForgers = await getForgers({
>>>>>>>
const retrieveNextForgers = async (network) => {
const { data } = await getForgers({
<<<<<<<
export const forgingTimesRetrieved = nextForgers => async (dispatch, getState) => {
const { network, blocks } = getState();
const { latestBlocks } = blocks;
const forgedInRoundNum = latestBlocks[0].height % voting.numberOfActiveDelegates;
const awaitingForgers = nextForgers || await retrieveNextForgers(network);
=======
export const forgingTimesRetrieved = () => async (dispatch, getState) => {
const { latestBlocks } = getState().blocks;
const forgedInRoundNum = latestBlocks[0].height % 103;
const awaitingForgers = await retrieveNextForgers(getState, 0);
>>>>>>>
export const forgingTimesRetrieved = nextForgers => async (dispatch, getState) => {
const { network, blocks } = getState();
const { latestBlocks } = getState().blocks;
const forgedInRoundNum = latestBlocks[0].height % 103;
const awaitingForgers = nextForgers || await retrieveNextForgers(network); |
<<<<<<<
balanceDark,
newsFeedAvatarDark,
fileOutlineDark,
=======
sign,
signActive,
verify,
verifyActive,
>>>>>>>
balanceDark,
newsFeedAvatarDark,
fileOutlineDark,
sign,
signActive,
verify,
verifyActive, |
<<<<<<<
account, peers, registerSecondPassphrase, closeDialog,
=======
account, peers, setActiveDialog, registerSecondPassphrase, t,
>>>>>>>
account, peers, registerSecondPassphrase, closeDialog, t,
<<<<<<<
<Passphrase
onPassGenerated={onLoginSubmission}
keepModal={true}
fee={Fees.setSecondPassphrase}
closeDialog={closeDialog}
confirmButton='Register'
useCaseNote={'your second passphrase will be required for all transactions sent from this account'}
securityNote={'Losing access to this passphrase will mean no funds can be sent from this account.'}/>
=======
!account.secondSignature ?
<MenuItem caption={t('Register second passphrase')}
className='register-second-passphrase'
onClick={() => setActiveDialog({
title: t('Register second passphrase'),
childComponent: Passphrase,
childComponentProps: {
onPassGenerated: onLoginSubmission,
keepModal: true,
fee: Fees.setSecondPassphrase,
confirmButton: 'Register',
useCaseNote: 'your second passphrase will be required for all transactions sent from this account',
securityNote: 'Losing access to this passphrase will mean no funds can be sent from this account.',
},
})}/> : <li className={`empty-template ${styles.hidden}`}></li>
>>>>>>>
<Passphrase
onPassGenerated={onLoginSubmission}
keepModal={true}
fee={Fees.setSecondPassphrase}
closeDialog={closeDialog}
confirmButton={t('Register')}
useCaseNote={t('your second passphrase will be required for all transactions sent from this account')}
securityNote={t('Losing access to this passphrase will mean no funds can be sent from this account.')}/> |
<<<<<<<
import { expect } from 'chai';
=======
import { Provider } from 'react-redux';
import chai, { expect } from 'chai';
>>>>>>>
import { expect } from 'chai';
import { Provider } from 'react-redux'; |
<<<<<<<
import liskLogo from '../assets/images/lisk-logo-v2.svg';
=======
import lskIcon from '../assets/images/icons-v2/icon-lsk.svg';
>>>>>>>
import liskLogo from '../assets/images/lisk-logo-v2.svg';
import lskIcon from '../assets/images/icons-v2/icon-lsk.svg';
<<<<<<<
liskLogo,
=======
lskIcon,
>>>>>>>
liskLogo,
lskIcon, |
<<<<<<<
changeFilters: this.changeFilters,
customFilters: this.state.customFilters,
detailAccount: this.props.account,
=======
updateCustomFilters: this.updateCustomFilters,
>>>>>>>
changeFilters: this.changeFilters,
customFilters: this.state.customFilters,
detailAccount: this.props.account,
updateCustomFilters: this.updateCustomFilters, |
<<<<<<<
if (fields.isHardwareWalletConnected) {
messageDetails = isHardwareWalletOnError ? messages.hw : messages.success;
}
=======
const token = getTokenFromAddress(this.props.fields.recipient.address);
const isFollowing = getIndexOfFollowedAccount(
this.props.followedAccounts,
{ address: this.props.fields.recipient.address },
) !== -1;
>>>>>>>
if (fields.isHardwareWalletConnected) {
messageDetails = isHardwareWalletOnError ? messages.hw : messages.success;
}
<<<<<<<
delegate={this.getDelegateInformation()}
balance={fields.recipient.balance}
address={fields.recipient.address}
=======
detailAccount={this.props.detailAccount}
delegate={delegate}
balance={this.props.fields.recipient.balance}
address={this.props.fields.recipient.address}
token={token}
>>>>>>>
delegate={this.getDelegateInformation()}
balance={fields.recipient.balance}
address={fields.recipient.address}
detailAccount={this.props.detailAccount}
token={token} |
<<<<<<<
import iconChart from '../assets/images/icons-v2/icon-chart.svg';
import iconCal from '../assets/images/icons-v2/icon-calendar.svg';
import iconLastTx from '../assets/images/icons-v2/icon-last-tx.svg';
=======
import txIncoming from '../assets/images/icons-v2/tx-incoming.svg';
import txOutgoing from '../assets/images/icons-v2/tx-outgoing.svg';
import txDelegate from '../assets/images/icons-v2/tx-delegate.svg';
import txVote from '../assets/images/icons-v2/tx-vote.svg';
import tx2ndPassphrase from '../assets/images/icons-v2/tx-2nd-passphrase.svg';
import txDefault from '../assets/images/icons-v2/tx-default.svg';
import txSendArrow from '../assets/images/icons-v2/tx-send-arrow.svg';
import icoLink from '../assets/images/icons-v2/link.svg';
import copy from '../assets/images/icons-v2/copy.svg';
>>>>>>>
import iconChart from '../assets/images/icons-v2/icon-chart.svg';
import iconCal from '../assets/images/icons-v2/icon-calendar.svg';
import iconLastTx from '../assets/images/icons-v2/icon-last-tx.svg';
import txIncoming from '../assets/images/icons-v2/tx-incoming.svg';
import txOutgoing from '../assets/images/icons-v2/tx-outgoing.svg';
import txDelegate from '../assets/images/icons-v2/tx-delegate.svg';
import txVote from '../assets/images/icons-v2/tx-vote.svg';
import tx2ndPassphrase from '../assets/images/icons-v2/tx-2nd-passphrase.svg';
import txDefault from '../assets/images/icons-v2/tx-default.svg';
import txSendArrow from '../assets/images/icons-v2/tx-send-arrow.svg';
import icoLink from '../assets/images/icons-v2/link.svg';
import copy from '../assets/images/icons-v2/copy.svg';
<<<<<<<
icon_chart: iconChart,
icon_cal: iconCal,
icon_last_tx: iconLastTx,
=======
txIncoming,
txOutgoing,
txDelegate,
txVote,
tx2ndPassphrase,
txDefault,
icoLink,
txSendArrow,
copy,
>>>>>>>
icon_chart: iconChart,
icon_cal: iconCal,
icon_last_tx: iconLastTx,
txIncoming,
txOutgoing,
txDelegate,
txVote,
tx2ndPassphrase,
txDefault,
icoLink,
txSendArrow,
copy, |
<<<<<<<
import { validateUrl, addHttp, getAutoLogInData, findMatchingLoginNetwork } from '../../utils/login';
=======
import { validateUrl, addHttp } from '../../utils/login';
import { FontIcon } from '../fontIcon';
import Ledger from '../ledger';
>>>>>>>
import { validateUrl, addHttp, getAutoLogInData, findMatchingLoginNetwork } from '../../utils/login';
import { FontIcon } from '../fontIcon';
import Ledger from '../ledger';
<<<<<<<
address,
network: loginNetwork.code,
=======
address: '',
network: networks.default.code,
isLedgerLogin: false,
isLedgerFirstLogin: false,
>>>>>>>
address,
network: loginNetwork.code,
isLedgerLogin: false,
isLedgerFirstLogin: false, |
<<<<<<<
'./register.test.js',
// './registerDelegate.test.js',
=======
// './register.test.js',
'./registerDelegate.test.js',
>>>>>>>
// './register.test.js',
// './registerDelegate.test.js', |
<<<<<<<
},
plugins: [require('stylelint')({ /* your options */ })],
}),
require('postcss-partial-import')({ /* options */ }),
require('postcss-reporter')({ clearMessages: true }),
require('postcss-for')({ /* options */ }),
],
/* eslint-enable */
=======
plugins: [require('stylelint')({ /* your options */ })],
}),
require('postcss-partial-import')({ /* options */ }),
require('postcss-reporter')({ clearMessages: true }),
],
/* eslint-enable */
},
>>>>>>>
plugins: [require('stylelint')({ /* your options */ })],
}),
require('postcss-partial-import')({ /* options */ }),
require('postcss-reporter')({ clearMessages: true }),
require('postcss-for')({ /* options */ }),
],
/* eslint-enable */
}, |
<<<<<<<
{fields.length > 3 && (
<span onClick={this.extendFilters} className={styles.actionable}>{t(`${areFiltersExtended ? 'Less' : 'More'} filters`)}</span>
)}
=======
<span onClick={this.extendFilters} className={[styles.actionable, 'more-less-switch'].join(' ')}>
{areFiltersExtended ? t('Less filters') : t('More Filters')}
</span>
>>>>>>>
{fields.length > 3 && (
<span onClick={this.extendFilters} className={[styles.actionable, 'more-less-switch'].join(' ')}>
{areFiltersExtended ? t('Less filters') : t('More Filters')}
</span>
)} |
<<<<<<<
data = asset?.votes ? generateVotes(asset) : data;
=======
data = asset && asset.votes ? generateVotes(asset, delegates) : data;
>>>>>>>
data = asset?.votes ? generateVotes(asset, delegates) : data; |
<<<<<<<
import RegisterDelegate from '../registerDelegate';
=======
import Send from '../send';
>>>>>>>
import RegisterDelegate from '../registerDelegate';
import Send from '../send'; |
<<<<<<<
FIND_APPROVED = function() {
return queryFind(STATUS_APPROVED, Session.get('categorySlug'));
}
FIND_PENDING = function() {
return queryFind(STATUS_PENDING, Session.get('categorySlug'));
}
var topPostsHandle = postListSubscription(FIND_APPROVED, sortBy('score'), 10);
var newPostsHandle = postListSubscription(FIND_APPROVED, sortBy('submitted'), 10);
var bestPostsHandle = postListSubscription(FIND_APPROVED, sortBy('baseScore'), 10);
var pendingPostsHandle = postListSubscription(FIND_PENDING, sortBy('createdAt'), 10);
=======
topPostsHandle = postListSubscription(FIND_APPROVED, {sort: {sticky: -1, score: -1}}, 10);
newPostsHandle = postListSubscription(FIND_APPROVED, {sort: {sticky: -1, submitted: -1}}, 10);
bestPostsHandle = postListSubscription(FIND_APPROVED, {sort: {sticky: -1, baseScore: -1}}, 10);
pendingPostsHandle = postListSubscription(
{$or: [{status: STATUS_PENDING}, {status: STATUS_REJECTED}]},
{sort: {createdAt: -1}},
10
);
>>>>>>>
FIND_APPROVED = function() {
return queryFind(STATUS_APPROVED, Session.get('categorySlug'));
}
FIND_PENDING = function() {
return queryFind(STATUS_PENDING, Session.get('categorySlug'));
}
topPostsHandle = postListSubscription(FIND_APPROVED, sortBy('score'), 10);
newPostsHandle = postListSubscription(FIND_APPROVED, sortBy('submitted'), 10);
bestPostsHandle = postListSubscription(FIND_APPROVED, sortBy('baseScore'), 10);
pendingPostsHandle = postListSubscription(FIND_PENDING, sortBy('createdAt'), 10); |
<<<<<<<
import { getAccount, setSecondPassphrase, send, transactions } from './account';
=======
import { getAccount, setSecondSecret, send, transactions,
extractPublicKey, extractAddress } from './account';
>>>>>>>
import { getAccount, setSecondPassphrase, send, transactions,
extractPublicKey, extractAddress } from './account'; |
<<<<<<<
cy.get(ss.searchAccountRow).find('.account-title').should('have.text', accountsAddress);
=======
cy.wait('@requestAccount');
cy.get(ss.accountAddress).should('have.text', accountsAddress)
.and(() => {
expect(getSearchesObjFromLS()[0].id).to.equal(accountsAddress);
expect(getSearchesObjFromLS()[0].searchTerm).to.equal(accountsAddress);
});
>>>>>>>
cy.wait('@requestAccount');
cy.wait('@requestDelegate');
cy.get(ss.searchAccountRow).find('.account-title').should('have.text', accountsAddress);
<<<<<<<
cy.get(ss.searchTransactionRow).find(ss.searchTransactionRowId).should('have.text', transactionId);
=======
cy.wait('@requestTransaction');
cy.get(ss.transactionId).should('have.text', transactionId)
.and(() => {
expect(getSearchesObjFromLS()[0].id).to.equal(transactionId);
expect(getSearchesObjFromLS()[0].searchTerm).to.equal(transactionId);
});
}
function assertDelegatePage(delegateName, delegateId) {
cy.wait('@requestDelegate');
cy.get(ss.accountName).should('have.text', delegateName)
.and(() => {
expect(getSearchesObjFromLS()[0].id).to.equal(delegateId);
expect(getSearchesObjFromLS()[0].searchTerm).to.equal(delegateName);
});
>>>>>>>
cy.wait('@requestTransaction');
cy.get(ss.searchTransactionRow).find(ss.searchTransactionRowId).should('have.text', transactionId); |
<<<<<<<
const enhanceTxListResponse = response => ({
...response,
data: response.data.map(tx => ({
...tx,
token: 'LSK',
})),
});
// eslint-disable-next-line max-statements, complexity, import/prefer-default-export
=======
const parseTxFilters = (filter = txFilters.all, address) => ({
[txFilters.incoming]: { recipientId: address },
[txFilters.outgoing]: { senderId: address },
[txFilters.all]: { senderIdOrRecipientId: address },
}[filter]);
const processParam = (customFilters, filtersKey, paramsKey, transformFn) => ({
...(customFilters[filtersKey] && customFilters[filtersKey] !== '' ? {
[paramsKey]: transformFn(customFilters[filtersKey]),
} : {}),
});
const parseCustomFilters = customFilters => ({
...processParam(customFilters, 'message', 'data', value => `%${value}%`),
...processParam(customFilters, 'dateFrom', 'fromTimestamp', (value) => {
const fromTimestamp = getTimestampFromFirstBlock(value, 'DD.MM.YY');
return fromTimestamp > 0 ? fromTimestamp : 0;
}),
...processParam(customFilters, 'dateTo', 'toTimestamp', (value) => {
const toTimestamp = getTimestampFromFirstBlock(value, 'DD.MM.YY', { inclusive: true });
return toTimestamp > 1 ? toTimestamp : 1;
}),
...processParam(customFilters, 'amountFrom', 'minAmount', toRawLsk),
...processParam(customFilters, 'amountTo', 'maxAmount', toRawLsk),
});
>>>>>>>
const enhanceTxListResponse = response => ({
...response,
data: response.data.map(tx => ({
...tx,
token: 'LSK',
})),
});
const parseTxFilters = (filter = txFilters.all, address) => ({
[txFilters.incoming]: { recipientId: address },
[txFilters.outgoing]: { senderId: address },
[txFilters.all]: { senderIdOrRecipientId: address },
}[filter]);
const processParam = (customFilters, filtersKey, paramsKey, transformFn) => ({
...(customFilters[filtersKey] && customFilters[filtersKey] !== '' ? {
[paramsKey]: transformFn(customFilters[filtersKey]),
} : {}),
});
const parseCustomFilters = customFilters => ({
...processParam(customFilters, 'message', 'data', value => `%${value}%`),
...processParam(customFilters, 'dateFrom', 'fromTimestamp', (value) => {
const fromTimestamp = getTimestampFromFirstBlock(value, 'DD.MM.YY');
return fromTimestamp > 0 ? fromTimestamp : 0;
}),
...processParam(customFilters, 'dateTo', 'toTimestamp', (value) => {
const toTimestamp = getTimestampFromFirstBlock(value, 'DD.MM.YY', { inclusive: true });
return toTimestamp > 1 ? toTimestamp : 1;
}),
...processParam(customFilters, 'amountFrom', 'minAmount', toRawLsk),
...processParam(customFilters, 'amountTo', 'maxAmount', toRawLsk),
});
<<<<<<<
if (type !== undefined) params.type = type;
if (customFilters.message) params.data = `%${customFilters.message}%`;
if (customFilters.dateFrom && customFilters.dateFrom !== '') {
params.fromTimestamp = getTimestampFromFirstBlock(customFilters.dateFrom, 'DD.MM.YY');
params.fromTimestamp = params.fromTimestamp > 0 ? params.fromTimestamp : 0;
}
if (customFilters.dateTo && customFilters.dateTo !== '') {
params.toTimestamp = getTimestampFromFirstBlock(customFilters.dateTo, 'DD.MM.YY', { inclusive: true });
params.toTimestamp = params.toTimestamp > 1 ? params.toTimestamp : 1;
}
if (customFilters.amountFrom && customFilters.amountFrom !== '') {
params.minAmount = toRawLsk(customFilters.amountFrom);
}
if (customFilters.amountTo && customFilters.amountTo !== '') {
params.maxAmount = toRawLsk(customFilters.amountTo);
}
if (filter === txFilters.incoming) params.recipientId = address;
if (filter === txFilters.outgoing) params.senderId = address;
if (filter === txFilters.all) params.senderIdOrRecipientId = address;
return new Promise((resolve, reject) => {
getAPIClient(networkConfig).transactions.get(params).then(response => (
resolve(enhanceTxListResponse(response))
)).catch(reject);
});
=======
return getAPIClient(networkConfig).transactions.get(params);
>>>>>>>
return new Promise((resolve, reject) => {
getAPIClient(networkConfig).transactions.get(params).then(response => (
resolve(enhanceTxListResponse(response))
)).catch(reject);
}); |
<<<<<<<
=======
import ReceiveDialog from '../receiveDialog';
import SaveAccount from '../saveAccount';
import Register from '../register';
>>>>>>> |
<<<<<<<
=======
import actionTypes from '../constants/actions';
import { vote, listAccountDelegates, listDelegates } from '../utils/api/delegate';
import { transactionAdded } from './transactions';
>>>>>>>
import { vote, listAccountDelegates, listDelegates } from '../utils/api/delegate';
import { transactionAdded } from './transactions';
<<<<<<<
export const votePlaced = ({
activePeer, passphrase, account, votedList, unvotedList, secondSecret }) =>
=======
export const delegatesAdded = data => ({
type: actionTypes.delegatesAdded,
data,
});
/**
* Toggles account's vote for the given delegate
*/
export const voteToggled = data => ({
type: actionTypes.voteToggled,
data,
});
/**
* Makes Api call to register votes
* Adds pending state and then after the duration of one round
* cleans the pending state
*/
export const votePlaced = ({ activePeer, account, votes, secondSecret }) =>
>>>>>>>
export const delegatesAdded = data => ({
type: actionTypes.delegatesAdded,
data,
});
/**
* Toggles account's vote for the given delegate
*/
export const voteToggled = data => ({
type: actionTypes.voteToggled,
data,
});
/**
* Makes Api call to register votes
* Adds pending state and then after the duration of one round
* cleans the pending state
*/
export const votePlaced = ({ activePeer, passphrase, account, votes, secondSecret }) => |
<<<<<<<
const settingsUpdated = sinon.spy();
const accountUpdated = sinon.spy();
const props = {
settingsUpdated,
accountUpdated,
settings,
t,
toggleMenu: sinon.spy(),
};
=======
const props = {
settingsUpdated: sinon.spy(),
accountUpdated: sinon.spy(),
settings,
t,
menuToggle: sinon.spy(),
startOnboarding: sinon.spy(),
isAuthenticated: true,
};
>>>>>>>
const props = {
settingsUpdated: sinon.spy(),
accountUpdated: sinon.spy(),
settings,
t,
toggleMenu: sinon.spy(),
startOnboarding: sinon.spy(),
isAuthenticated: true,
};
<<<<<<<
wrapper = mount(<Router>
=======
window.innerWidth = breakpoints.l;
wrapper = mount(
>>>>>>>
window.innerWidth = breakpoints.l;
wrapper = mount(<Router> |
<<<<<<<
import WalletHeader from './walletHeader';
import WalletDetails from '../../wallet/walletDetails';
=======
import TransactionsOverviewHeader from '../transactionsOverviewHeader/transactionsOverviewHeader';
>>>>>>>
import WalletDetails from '../../wallet/walletDetails';
import TransactionsOverviewHeader from '../transactionsOverviewHeader/transactionsOverviewHeader'; |
<<<<<<<
if (accountData.token === tokenMap.LSK.key) {
searchVotes({ address, offset: 0, limit: 101 })(dispatch, getState);
}
=======
searchVotes({ address })(dispatch, getState);
>>>>>>>
if (accountData.token === tokenMap.LSK.key) {
searchVotes({ address })(dispatch, getState);
} |
<<<<<<<
import languageSwitcherTheme from './languageSwitcher.css';
import Checkbox from '../toolbox/checkbox';
import RelativeLink from '../relativeLink';
=======
// eslint-disable-next-line import/no-named-as-default
import SliderCheckbox from '../toolbox/checkbox';
>>>>>>>
import Checkbox from '../toolbox/checkbox';
<<<<<<<
const showSetting = this.props.showSetting ? styles.active : '';
const { t, hasSecondPassphrase } = this.props;
return <footer className={`${styles.wrapper} ${showSetting}`}>
=======
const { t } = this.props;
return <footer className={styles.wrapper}>
>>>>>>>
const showSetting = this.props.showSetting ? styles.active : '';
const { t } = this.props;
return <footer className={`${styles.wrapper} ${showSetting}`}> |
<<<<<<<
import balance from '../assets/images/icons-v2/balance.svg';
=======
import bookmarksIconEmptyState from '../assets/images/icons-v2/bookmarks_empty_state.svg';
import lskIcon from '../assets/images/icons-v2/icon-lsk.svg';
>>>>>>>
import balance from '../assets/images/icons-v2/balance.svg';
import bookmarksIconEmptyState from '../assets/images/icons-v2/bookmarks_empty_state.svg';
import lskIcon from '../assets/images/icons-v2/icon-lsk.svg';
<<<<<<<
balance,
=======
bookmarksIconEmptyState,
lskIcon,
>>>>>>>
balance,
bookmarksIconEmptyState,
lskIcon, |
<<<<<<<
import { getDeviceList } from '../../utils/hwWallet';
=======
import HeaderV2 from '../headerV2/headerV2';
>>>>>>>
import { getDeviceList } from '../../utils/hwWallet';
import HeaderV2 from '../headerV2/headerV2';
<<<<<<<
<Box>
<LedgerLogin
account={this.props.account}
loginType={loginType.trezor}
network={getNetwork(this.props.network)}
cancelLedgerLogin={this.cancelLedgerLogin.bind(this)} />
</Box>);
}
if (this.state.isTrezorLogin && (this.state.devices[0] && this.state.devices[0].model !== 'Ledger')) {
return (
<Box>
<TrezorLogin
account={this.props.account}
loginType={loginType.trezor}
network={getNetwork(this.props.network)}
cancelLedgerLogin={this.cancelLedgerLogin.bind(this)} />
</Box>);
=======
<React.Fragment>
<HeaderV2 showSettings={true} />
<div className={styles.wrapper}>
<LedgerLogin
account={this.props.account}
loginType={loginType.normal}
network={getNetwork(this.props.network)}
cancelLedgerLogin={this.cancelLedgerLogin.bind(this)} />
</div>
</React.Fragment>
);
>>>>>>>
<React.Fragment>
<HeaderV2 showSettings={true} />
<div className={styles.wrapper}>
<LedgerLogin
account={this.props.account}
loginType={loginType.trezor}
network={getNetwork(this.props.network)}
cancelLedgerLogin={this.cancelLedgerLogin.bind(this)} />
</div>
</React.Fragment>);
}
if (this.state.isTrezorLogin && (this.state.devices[0] && this.state.devices[0].model !== 'Ledger')) {
return (
<React.Fragment>
<HeaderV2 showSettings={true} />
<div className={styles.wrapper}>
<TrezorLogin
account={this.props.account}
loginType={loginType.trezor}
network={getNetwork(this.props.network)}
cancelLedgerLogin={this.cancelLedgerLogin.bind(this)} />
</div>
</React.Fragment>); |
<<<<<<<
import { shallow } from 'enzyme';
import configureMockStore from 'redux-mock-store';
=======
import { mount } from 'enzyme';
import PropTypes from 'prop-types';
>>>>>>>
import configureMockStore from 'redux-mock-store';
import { shallow } from 'enzyme';
import PropTypes from 'prop-types'; |
<<<<<<<
=======
import { send, getTransactions, getSingleTransaction } from '../utils/api/transactions';
>>>>>>>
<<<<<<<
export const testExtensions = () => ({
type: 'extensinonTest',
});
export const transactionsFilterSet = ({
address, limit, filter, customFilters = {},
}) => (dispatch, getState) => {
const networkConfig = getState().network;
dispatch(loadingStarted(actionTypes.transactionsFilterSet));
return transactionsAPI.getTransactions({
networkConfig,
address,
limit,
filter,
customFilters,
}).then((response) => {
dispatch({
data: {
confirmed: response.data,
count: parseInt(response.meta.count, 10),
filter,
customFilters,
},
type: actionTypes.transactionsFiltered,
});
if (filter !== undefined) {
dispatch({
data: {
filterName: 'wallet',
value: filter,
},
type: actionTypes.addFilter,
});
}
dispatch(loadingFinished(actionTypes.transactionsFilterSet));
});
};
export const transactionsUpdateUnconfirmed = ({ address, pendingTransactions }) =>
(dispatch, getState) => {
const liskAPIClient = getState().peers.liskAPIClient;
return transactionsAPI.unconfirmedTransactions(liskAPIClient, address).then(response =>
dispatch({
data: {
failed: pendingTransactions.filter(tx =>
response.data.filter(unconfirmedTx => tx.id === unconfirmedTx.id).length === 0),
},
type: actionTypes.transactionsFailed,
}));
};
export const loadTransactionsFinish = accountUpdated =>
(dispatch) => {
dispatch(loadingFinished(actionTypes.transactionsLoad));
dispatch({
data: accountUpdated,
type: actionTypes.transactionsLoadFinish,
});
};
export const loadTransactions = ({ publicKey, address }) =>
(dispatch, getState) => {
const networkConfig = getState().network;
const lastActiveAddress = publicKey && extractAddress(publicKey);
const isSameAccount = lastActiveAddress === address;
dispatch(loadingStarted(actionTypes.transactionsLoad));
transactionsAPI.getTransactions({ networkConfig, address, limit: 25 })
.then((transactionsResponse) => {
dispatch(loadAccount({
address,
transactionsResponse,
isSameAccount,
}));
dispatch({
data: {
count: parseInt(transactionsResponse.meta.count, 10),
confirmed: transactionsResponse.data,
},
type: actionTypes.transactionsLoaded,
});
});
};
export const transactionsRequested = ({
address, limit, offset, filter, customFilters = {},
=======
/**
* This action is used to request transactions on dashboard and wallet page.
*
* @param {Object} params - all params
* @param {String} params.address - address of the account to fetch the transactions for
* @param {Number} params.limit - amount of transactions to fetch
* @param {Number} params.offset - index of the first transaction
* @param {Object} params.filters - object with filters for the filer dropdown
* (e.g. minAmount, maxAmount, message, minDate, maxDate)
* @param {Number} params.filters.direction - one of values from src/constants/transactionFilters.js
*/
export const loadTransactions = ({
address, limit, offset, filters,
>>>>>>>
/**
* This action is used to request transactions on dashboard and wallet page.
*
* @param {Object} params - all params
* @param {String} params.address - address of the account to fetch the transactions for
* @param {Number} params.limit - amount of transactions to fetch
* @param {Number} params.offset - index of the first transaction
* @param {Object} params.filters - object with filters for the filer dropdown
* (e.g. minAmount, maxAmount, message, minDate, maxDate)
* @param {Number} params.filters.direction - one of values from src/constants/transactionFilters.js
*/
export const loadTransactions = ({
address, limit, offset, filters,
<<<<<<<
transactionsAPI.getTransactions({
networkConfig, address, limit, offset, filter, customFilters,
=======
getTransactions({
networkConfig, address, limit, offset, filters,
>>>>>>>
transactionsAPI.getTransactions({
networkConfig, address, limit, offset, filters,
<<<<<<<
transactionsAPI.getTransactions({
networkConfig, address, limit, filter, customFilters,
=======
getTransactions({
networkConfig, address, limit, filters,
>>>>>>>
transactionsAPI.getTransactions({
networkConfig, address, limit, filters,
<<<<<<<
[fail, broadcastTx] = await to(sendWithHW(
network,
account,
data.recipientId,
data.amount,
data.secondPassphrase,
data.data,
));
if (fail) throw new Error(fail);
=======
dispatch(addPendingTransaction({
id: callResult.id,
senderPublicKey: account.publicKey,
senderId: account.address,
recipientId,
amount: toRawLsk(amount),
fee: Fees.send,
type: transactionTypes.send,
asset: { data },
}));
dispatch(passphraseUsed(passphrase));
>>>>>>>
[fail, broadcastTx] = await to(sendWithHW(
network,
account,
data.recipientId,
data.amount,
data.secondPassphrase,
data.data,
));
if (fail) throw new Error(fail); |
<<<<<<<
<Input label={this.props.t('Delegate name')} required={true}
autoFocus={true}
className='username'
onChange={handleChange.bind(this, this, 'name')}
error={this.state.name.error}
value={this.state.name.value} />
<AuthInputs
passphrase={this.state.passphrase}
secondPassphrase={this.state.secondPassphrase}
onChange={handleChange.bind(this, this)} />
<hr/>
<InfoParagraph>
{this.props.t('Becoming a delegate requires registration. You may choose your own delegate name, which can be used to promote your delegate. Only the top 101 delegates are eligible to forge. All fees are shared equally between the top 101 delegates.')}
</InfoParagraph>
<ActionBar
secondaryButton={{
onClick: this.props.closeDialog,
}}
primaryButton={{
label: this.props.t('Register'),
fee: Fees.registerDelegate,
className: 'register-button',
disabled: (!this.state.name.value ||
this.props.account.isDelegate ||
!authStateIsValid(this.state)),
onClick: this.register.bind(this),
}} />
=======
<form onSubmit={this.register.bind(this)}>
<Input label='Delegate name' required={true}
autoFocus={true}
className='username'
onChange={handleChange.bind(this, this, 'name')}
error={this.state.name.error}
value={this.state.name.value} />
<AuthInputs
passphrase={this.state.passphrase}
secondPassphrase={this.state.secondPassphrase}
onChange={handleChange.bind(this, this)} />
<hr/>
<InfoParagraph>
Becoming a delegate requires registration. You may choose your own
delegate name, which can be used to promote your delegate. Only the
top 101 delegates are eligible to forge. All fees are shared equally
between the top 101 delegates.
</InfoParagraph>
<ActionBar
secondaryButton={{
onClick: this.props.closeDialog,
}}
primaryButton={{
label: 'Register',
fee: Fees.registerDelegate,
type: 'submit',
className: 'register-button',
disabled: (!this.state.name.value ||
this.props.account.isDelegate ||
!authStateIsValid(this.state)),
}} />
</form>
>>>>>>>
<form onSubmit={this.register.bind(this)}>
<Input label={this.props.t('Delegate name')} required={true}
autoFocus={true}
className='username'
onChange={handleChange.bind(this, this, 'name')}
error={this.state.name.error}
value={this.state.name.value} />
<AuthInputs
passphrase={this.state.passphrase}
secondPassphrase={this.state.secondPassphrase}
onChange={handleChange.bind(this, this)} />
<hr/>
<InfoParagraph>
{this.props.t('Becoming a delegate requires registration. You may choose your own delegate name, which can be used to promote your delegate. Only the top 101 delegates are eligible to forge. All fees are shared equally between the top 101 delegates.')}
</InfoParagraph>
<ActionBar
secondaryButton={{
onClick: this.props.closeDialog,
}}
primaryButton={{
label: this.props.t('Register'),
fee: Fees.registerDelegate,
type: 'submit',
className: 'register-button',
disabled: (!this.state.name.value ||
this.props.account.isDelegate ||
!authStateIsValid(this.state)),
}} />
</form> |
<<<<<<<
import { expect } from 'chai';
import sinon from 'sinon';
=======
import chai, { expect } from 'chai';
import sinonChai from 'sinon-chai';
>>>>>>>
import { expect } from 'chai'; |
<<<<<<<
import transactionSuccess from '../../../assets/images/illustrations/transaction_success.svg';
import transactionError from '../../../assets/images/illustrations/transaction_error.svg';
=======
import pageNotFound from '../../../assets/images/illustrations/illustration-page-not-found.svg';
>>>>>>>
import transactionSuccess from '../../../assets/images/illustrations/transaction_success.svg';
import transactionError from '../../../assets/images/illustrations/transaction_error.svg';
import pageNotFound from '../../../assets/images/illustrations/illustration-page-not-found.svg';
<<<<<<<
transactionSuccess,
transactionError,
=======
pageNotFound,
>>>>>>>
transactionSuccess,
transactionError,
pageNotFound, |
<<<<<<<
type: actionTypes.passphraseUsed,
data: data.passphrase,
=======
data: expectedAction, type: actionTypes.addPendingTransaction,
>>>>>>>
data: data.passphrase, type: actionTypes.passphraseUsed, |
<<<<<<<
import InitializationMessage from '../initializationMessage';
=======
>>>>>>>
import InitializationMessage from '../initializationMessage';
<<<<<<<
const defaultRoutes = allRoutes.filter(routeObj => routeObj.component);
const routesV2Layout = allRoutes.filter(routeObj => routeObj.isV2Layout);
=======
const defaultRoutes = allRoutes.filter(routeObj => routeObj.component);
const signinFlowRoutes = allRoutes.filter(routeObj => routeObj.isSigninFlow);
>>>>>>>
const defaultRoutes = allRoutes.filter(routeObj => routeObj.component);
const signinFlowRoutes = allRoutes.filter(routeObj => routeObj.isSigninFlow);
<<<<<<<
? `${stylesV2.v2Wrapper} ${styles.loaded} appLoaded`
: `${styles.v2Wrapper}`}
=======
? `${styles.wrapper} ${styles.loaded} appLoaded`
: `${styles.wrapper}`
}
>>>>>>>
? `${styles.wrapper} ${styles.loaded} appLoaded`
: `${styles.wrapper}`
}
<<<<<<<
{
this.state.loaded && routesV2Layout.map((route, key) => (
<Route
path={route.path}
key={key}
component={route.component}
exact={route.exact}
/>
))
}
=======
{this.state.loaded
&& signinFlowRoutes.map((route, key) => (
<Route
path={route.path}
key={key}
component={route.component}
exact={route.exact}
/>
))
}
>>>>>>>
{this.state.loaded
&& signinFlowRoutes.map((route, key) => (
<Route
path={route.path}
key={key}
component={route.component}
exact={route.exact}
/>
))
} |
<<<<<<<
return (isWalletRoute
? (
<PageHeader
className="wallet-header"
title={t('{{token}} Wallet', { token: tokenMap[activeToken].label })}
subtitle={t('All important information at a glance')}
>
<div className={`${styles.buttonsHolder}`}>
<DropdownButton
className={`${styles.requestDropdown} requestContainer request-dropdown`}
buttonClassName="tx-receive-bt"
buttonLabel={t('Request {{token}}', { token: activeToken })}
>
<Request address={address} token={activeToken} t={t} />
</DropdownButton>
<Link to={`${routes.send.path}?wallet`} className="tx-send-bt">
<PrimaryButtonV2>
{t('Send {{token}}', { token: activeToken })}
</PrimaryButtonV2>
</Link>
</div>
</PageHeader>
)
: (
<header className={`${styles.wrapper}`}>
<HeaderAccountInfo
token={activeToken}
bookmarks={bookmarks}
address={address}
delegate={delegate}
account={this.props.account}
toggleActiveToken={this.props.toggleActiveToken}
/>
<div className={`${styles.buttonsHolder}`}>
<Link
to={`${routes.send.path}?wallet&recipient=${address}`}
className="send-to-address"
>
<SecondaryButtonV2>
{t('Send {{token}} to this Account ', { token: activeToken })}
</SecondaryButtonV2>
</Link>
<DropdownButton
buttonClassName="bookmark-account-button"
className={`${styles.bookmarkDropdown} bookmark-account`}
buttonLabel={isBookmark ? t('Account bookmarked') : t('Bookmark account')}
ButtonComponent={isBookmark ? SecondaryButtonV2 : PrimaryButtonV2}
>
<Bookmark
token={activeToken}
delegate={delegate}
address={address}
detailAccount={detailAccount}
isBookmark={isBookmark}
/>
</DropdownButton>
</div>
</header>
)
=======
return (
<header className={`${styles.wrapper}`}>
{ isWalletRoute ? (
<React.Fragment>
<span>
<h1 className="wallet-header">{t('{{token}} Wallet', { token: tokenMap[activeToken].label })}</h1>
<span className={styles.subtitle}>
{t('All important information at a glance')}
</span>
</span>
<div className={`${styles.buttonsHolder}`}>
<DropdownButton
className={`${styles.requestDropdown} requestContainer request-dropdown`}
buttonClassName="tx-receive-bt"
buttonLabel={t('Request {{token}}', { token: activeToken })}
>
<Request address={address} token={activeToken} t={t} />
</DropdownButton>
<Link to={`${routes.send.path}?wallet`} className="tx-send-bt">
<PrimaryButtonV2>
{t('Send {{token}}', { token: activeToken })}
</PrimaryButtonV2>
</Link>
</div>
</React.Fragment>
) : (
<React.Fragment>
<HeaderAccountInfo
token={activeToken}
bookmarks={bookmarks}
address={address}
delegate={delegate}
account={this.props.account}
toggleActiveToken={this.props.toggleActiveToken}
/>
<div className={`${styles.buttonsHolder}`}>
<Link
to={`${routes.send.path}?wallet&recipient=${address}`}
className="send-to-address"
>
<SecondaryButtonV2>
{t('Send {{token}} to this wallet ', { token: activeToken })}
</SecondaryButtonV2>
</Link>
<DropdownButton
buttonClassName={`${styles.bookmarkBtn} bookmark-account-button`}
className={`${styles.bookmarkDropdown} bookmark-account`}
buttonLabel={isBookmark ? t('Edit bookmark') : t('Bookmark')}
ButtonComponent={PrimaryButtonV2}
>
<BookmarkDropdown
token={activeToken}
delegate={delegate}
address={address}
detailAccount={detailAccount}
isBookmark={isBookmark}
/>
</DropdownButton>
</div>
</React.Fragment>
)}
</header>
>>>>>>>
return (isWalletRoute
? (
<PageHeader
className="wallet-header"
title={t('{{token}} Wallet', { token: tokenMap[activeToken].label })}
subtitle={t('All important information at a glance')}
>
<div className={`${styles.buttonsHolder}`}>
<DropdownButton
className={`${styles.requestDropdown} requestContainer request-dropdown`}
buttonClassName="tx-receive-bt"
buttonLabel={t('Request {{token}}', { token: activeToken })}
>
<Request address={address} token={activeToken} t={t} />
</DropdownButton>
<Link to={`${routes.send.path}?wallet`} className="tx-send-bt">
<PrimaryButtonV2>
{t('Send {{token}}', { token: activeToken })}
</PrimaryButtonV2>
</Link>
</div>
</PageHeader>
)
: (
<header className={`${styles.wrapper}`}>
<HeaderAccountInfo
token={activeToken}
bookmarks={bookmarks}
address={address}
delegate={delegate}
account={this.props.account}
toggleActiveToken={this.props.toggleActiveToken}
/>
<div className={`${styles.buttonsHolder}`}>
<Link
to={`${routes.send.path}?wallet&recipient=${address}`}
className="send-to-address"
>
<SecondaryButtonV2>
{t('Send {{token}} to this Account ', { token: activeToken })}
</SecondaryButtonV2>
</Link>
<DropdownButton
buttonClassName="bookmark-account-button"
className={`${styles.bookmarkDropdown} bookmark-account`}
buttonLabel={isBookmark ? t('Account bookmarked') : t('Bookmark account')}
ButtonComponent={isBookmark ? SecondaryButtonV2 : PrimaryButtonV2}
>
<BookmarkDropdown
token={activeToken}
delegate={delegate}
address={address}
detailAccount={detailAccount}
isBookmark={isBookmark}
/>
</DropdownButton>
</div>
</header>
) |
<<<<<<<
import moment from 'moment';
=======
>>>>>>>
<<<<<<<
<PassphraseRenderer showInfo passphrase={account.passphrase} />
<div className={styles.copyButtonContainer}>
<CopyToClipboard
onClick={this.handleClick}
value={account.passphrase}
text={t('Copy entire passphrase')}
copyClassName={styles.copyIcon}
Container={SecondaryButton}
containerProps={{ size: 'xs' }}
/>
<span className={['tip', styles.tipContainer, !this.state.showTip && styles.hidden].join(' ')}>
<Icon color="red" name="warningRound" />
<p>{t('Make sure to store it somewhere safe')}</p>
</span>
=======
<PassphraseRenderer showInfo values={account.passphrase.split(' ')} />
<div className={styles.copyButtonContainer}>
<CopyToClipboard
onClick={this.handleClick}
value={account.passphrase}
text={t('Copy entire passphrase')}
copyClassName={styles.copyIcon}
Container={SecondaryButton}
containerProps={{ size: 'xs' }}
/>
<span className={`${styles.tipContainer} ${!this.state.showTip && styles.hidden}`}>
<Icon color="red" name="warningRound" />
<p className="tip">{t('Make sure to store it somewhere safe')}</p>
</span>
>>>>>>>
<PassphraseRenderer showInfo passphrase={account.passphrase} />
<div className={styles.copyButtonContainer}>
<CopyToClipboard
onClick={this.handleClick}
value={account.passphrase}
text={t('Copy entire passphrase')}
copyClassName={styles.copyIcon}
Container={SecondaryButton}
containerProps={{ size: 'xs' }}
/>
<span className={['tip', styles.tipContainer, !this.state.showTip && styles.hidden].join(' ')}>
<Icon color="red" name="warningRound" />
<p>{t('Make sure to store it somewhere safe')}</p>
</span> |
<<<<<<<
import lock from '../../../assets/images/icons/lock.svg';
import unlock from '../../../assets/images/icons/unlock.svg';
import loading from '../../../assets/images/icons/loading.svg';
=======
import txUnlock from '../../../assets/images/icons/tx-unlock.svg';
>>>>>>>
import lock from '../../../assets/images/icons/lock.svg';
import unlock from '../../../assets/images/icons/unlock.svg';
import loading from '../../../assets/images/icons/loading.svg';
import txUnlock from '../../../assets/images/icons/tx-unlock.svg';
<<<<<<<
lock,
unlock,
loading,
=======
txUnlock,
>>>>>>>
lock,
unlock,
loading,
txUnlock, |
<<<<<<<
import accounts from '../../../../test/constants/accounts';
=======
import Lisk from '@liskhq/lisk-client';
import to from 'await-to-js';
import { create } from '../../../utils/api/lsk/transactions';
import accounts from '../../../../test/constants/accounts';
>>>>>>>
import Lisk from '@liskhq/lisk-client';
import to from 'await-to-js';
import { create } from '../../../utils/api/lsk/transactions';
import accounts from '../../../../test/constants/accounts';
<<<<<<<
info: {
LSK: {
address: '123456789L',
balance: 11000,
secondPublicKey: '',
},
},
isDelegate: false,
=======
address: '123456789L',
balance: 11000,
passphrase: accounts.genesis.passphrase,
delegate: {},
>>>>>>>
address: '123456789L',
balance: 11000,
secondPublicKey: '',
isDelegate: false, |
<<<<<<<
switchChannel: 'SWITCH_CHANNEL',
=======
addFilter: 'ADD_FILTER',
>>>>>>>
switchChannel: 'SWITCH_CHANNEL',
addFilter: 'ADD_FILTER', |
<<<<<<<
=======
import Passphrase from '../passphrase';
import PassphraseInput from '../passphraseInput';
>>>>>>>
import PassphraseInput from '../passphraseInput';
<<<<<<<
=======
autologin() {
const savedAccounts = localStorage.getItem('accounts');
if (savedAccounts && !this.props.account.afterLogout) {
const account = JSON.parse(savedAccounts)[0];
const network = Object.assign({}, networksRaw[account.network]);
if (account.network === 2) {
network.address = account.address;
}
// set active peer
this.props.activePeerSet({
publicKey: account.publicKey,
network,
});
}
}
onLoginSubmission(passphrase) {
const network = Object.assign({}, networksRaw[this.state.network]);
if (this.state.network === 2) {
network.address = this.state.address;
}
// set active peer
this.props.activePeerSet({
passphrase,
network,
});
}
>>>>>>>
autologin() {
const savedAccounts = localStorage.getItem('accounts');
if (savedAccounts && !this.props.account.afterLogout) {
const account = JSON.parse(savedAccounts)[0];
const network = Object.assign({}, networksRaw[account.network]);
if (account.network === 2) {
network.address = account.address;
}
// set active peer
this.props.activePeerSet({
publicKey: account.publicKey,
network,
});
}
} |
<<<<<<<
describe('FormattedNumber', () => {
const normalizeNumber = 100000000;
it('should normalize "12932689.645" as "12,932,689.645"', () => {
const inputValue = '12932689.645' * normalizeNumber;
=======
describe('<FormattedNumber />', () => {
it('expect "12932689.645" to be equal "12,932,689.645"', () => {
const inputValue = '12932689.645';
>>>>>>>
describe('FormattedNumber', () => {
it('should normalize "12932689.645" as "12,932,689.645"', () => {
const inputValue = '12932689.645';
<<<<<<<
it('should normalize "2500" as "2,500"', () => {
const inputValue = '2500' * normalizeNumber;
=======
it('expect "2500" to be equal "2,500"', () => {
const inputValue = '2500';
>>>>>>>
it('should normalize "2500" as "2,500"', () => {
const inputValue = '2500';
<<<<<<<
it('should normalize "-78945" as "-78,945"', () => {
const inputValue = '78945' * normalizeNumber;
=======
it('expect "-78945" to be equal "-78,945"', () => {
const inputValue = '78945';
>>>>>>>
it('should normalize "-78945" as "-78,945"', () => {
const inputValue = '78945';
<<<<<<<
it('should normalize "500.12345678" as "500.12345678"', () => {
const inputValue = '500.12345678' * normalizeNumber;
=======
it('expect "500.12345678" to be equal "500.12345678"', () => {
const inputValue = '500.12345678';
>>>>>>>
it('should normalize "500.12345678" as "500.12345678"', () => {
const inputValue = '500.12345678'; |
<<<<<<<
import offlineMiddleware from './offline';
=======
import notificationMiddleware from './notification';
>>>>>>>
import offlineMiddleware from './offline';
import notificationMiddleware from './notification';
<<<<<<<
offlineMiddleware,
=======
notificationMiddleware,
>>>>>>>
offlineMiddleware,
notificationMiddleware, |
<<<<<<<
let transactionsRequestInitSpy;
let accountVotesFetchedSpy;
let accountVotersFetchedSpy;
=======
let loadTransactionsSpy;
const storeState = {
peers: { data: { options: {} } },
account: { address: accounts.genesis.address,
delegate: {},
publicKey: accounts.genesis.publicKey },
transactions: {
account: { balance: 0 },
pending: [],
confirmed: [],
},
loading: [],
};
>>>>>>>
let accountVotesFetchedSpy;
let accountVotersFetchedSpy;
let loadTransactionsSpy;
const storeState = {
peers: { data: { options: {} } },
account: {
address: accounts.genesis.address,
},
transactions: {
account: { balance: 0 },
pending: [],
confirmed: [],
},
loading: [],
};
<<<<<<<
transactionsRequestInitSpy = spy(transactions, 'transactionsRequestInit');
accountVotesFetchedSpy = spy(account, 'accountVotesFetched');
accountVotersFetchedSpy = spy(account, 'accountVotersFetched');
const storeState = {
transactions: {
account: { balance: 0 },
pending: [],
confirmed: [],
},
peers: { options: { data: {} } },
account: { address: 'some address' },
loading: [],
};
=======
loadTransactionsSpy = spy(transactions, 'loadTransactions');
>>>>>>>
loadTransactionsSpy = spy(transactions, 'loadTransactions');
accountVotesFetchedSpy = spy(account, 'accountVotesFetched');
accountVotersFetchedSpy = spy(account, 'accountVotersFetched');
<<<<<<<
transactionsRequestInitSpy.restore();
accountVotesFetchedSpy.restore();
accountVotersFetchedSpy.restore();
=======
loadTransactionsSpy.restore();
>>>>>>>
accountVotesFetchedSpy.restore();
accountVotersFetchedSpy.restore();
loadTransactionsSpy.restore(); |
<<<<<<<
const VotingRow = (props) => {
const { data } = props;
return (<TableRow className={`${styles.row} ${setRowClass(data)}`}>
=======
class VotingRow extends React.Component {
// eslint-disable-next-line class-methods-use-this
shouldComponentUpdate(nextProps) {
return !!nextProps.data.dirty;
}
render() {
const props = this.props;
const { data } = props;
return (<TableRow {...props} className={`${styles.row} ${setRowClass(data)}`}>
>>>>>>>
class VotingRow extends React.Component {
// eslint-disable-next-line class-methods-use-this
shouldComponentUpdate(nextProps) {
return !!nextProps.data.dirty;
}
render() {
const props = this.props;
const { data } = props;
return (<TableRow className={`${styles.row} ${setRowClass(data)}`}> |
<<<<<<<
if(this.data) // XXX
document.title = this.data.title;
=======
document.title = $(".post-title").text();
>>>>>>>
if(this.data) // XXX
document.title = $(".post-title").text(); |
<<<<<<<
import checkmark from '../assets/images/icons-v2/checkmark-16-filled.svg';
import incoming from '../assets/images/icons-v2/incoming.svg';
import outgoing from '../assets/images/icons-v2/outgoing.svg';
=======
import checkboxFilled from '../assets/images/icons-v2/checkmark-16-filled.svg';
import checkmark from '../assets/images/icons-v2/checkmark.svg';
>>>>>>>
import incoming from '../assets/images/icons-v2/incoming.svg';
import outgoing from '../assets/images/icons-v2/outgoing.svg';
import checkboxFilled from '../assets/images/icons-v2/checkmark-16-filled.svg';
import checkmark from '../assets/images/icons-v2/checkmark.svg'; |
<<<<<<<
it('should serialize meta on hasOne relationship if present', () => {
jsonApi.define('product', {
title: '',
category: {
jsonApi: 'hasOne',
type: 'categories'
}
})
let serializedItem = serialize.resource.call(jsonApi, 'product', {id: '5', title: 'Hello', category: {
id: 4,
type: 'categories',
meta: {customStuff: 'More custom stuff'}
}})
expect(serializedItem.relationships.category.data.meta.customStuff).to.eql('More custom stuff')
})
it('should serialize meta on hasMany relationship if present', () => {
jsonApi.define('product', {
title: '',
tags: {
jsonApi: 'hasMany',
type: 'tags'
}
})
let serializedItem = serialize.resource.call(jsonApi, 'product', {id: '5', title: 'Hello', tags: [{
id: 4,
type: 'tags',
meta: {customStuff: 'More custom stuff'}}
]})
expect(serializedItem.relationships.tags.data[0].meta.customStuff).to.eql('More custom stuff')
})
=======
it('should not serialize collection of items if model is not present', () => {
const data = {
id: '5',
title: 'Hello'
}
let serializedItem = serialize.collection.call(
jsonApi,
undefined,
data
)
expect(serializedItem).to.eql(data)
})
it('should not serialize resource if model is not present', () => {
const data = {
id: '5',
title: 'Hello'
}
let serializedItem = serialize.resource.call(
jsonApi,
undefined,
data
)
expect(serializedItem).to.eql(data)
})
>>>>>>>
it('should serialize meta on hasOne relationship if present', () => {
jsonApi.define('product', {
title: '',
category: {
jsonApi: 'hasOne',
type: 'categories'
}
})
let serializedItem = serialize.resource.call(jsonApi, 'product', {id: '5', title: 'Hello', category: {
id: 4,
type: 'categories',
meta: {customStuff: 'More custom stuff'}
}})
expect(serializedItem.relationships.category.data.meta.customStuff).to.eql('More custom stuff')
})
it('should serialize meta on hasMany relationship if present', () => {
jsonApi.define('product', {
title: '',
tags: {
jsonApi: 'hasMany',
type: 'tags'
}
})
let serializedItem = serialize.resource.call(jsonApi, 'product', {id: '5', title: 'Hello', tags: [{
id: 4,
type: 'tags',
meta: {customStuff: 'More custom stuff'}}
]})
expect(serializedItem.relationships.tags.data[0].meta.customStuff).to.eql('More custom stuff')
})
it('should not serialize collection of items if model is not present', () => {
const data = {
id: '5',
title: 'Hello'
}
let serializedItem = serialize.collection.call(
jsonApi,
undefined,
data
)
expect(serializedItem).to.eql(data)
})
it('should not serialize resource if model is not present', () => {
const data = {
id: '5',
title: 'Hello'
}
let serializedItem = serialize.resource.call(
jsonApi,
undefined,
data
)
expect(serializedItem).to.eql(data)
}) |
<<<<<<<
beforeEach(inject((_$componentController_, _$rootScope_, _$state_) => {
=======
beforeEach(inject((_$componentController_, _$rootScope_, _Passphrase_) => {
>>>>>>>
beforeEach(inject((_$componentController_, _$rootScope_, _$state_, _Passphrase_) => {
<<<<<<<
$state = _$state_;
=======
Passphrase = _Passphrase_;
>>>>>>>
$state = _$state_;
Passphrase = _Passphrase_;
<<<<<<<
describe('$scope.doTheLogin()', () => {
it('sets this.phassphrase as this.input_passphrase processed by fixCaseAndWhitespace', () => {
controller.input_passphrase = '\tGLOW two GliMpse camp aware tip brief confirm similar code float defense ';
controller.doTheLogin();
expect($rootScope.passphrase).to.equal('glow two glimpse camp aware tip brief confirm similar code float defense');
=======
// OK
describe('componentController.passConfirmSubmit()', () => {
it('sets this.phassphrase as this.input_passphrase processed by normalizer', () => {
controller.input_passphrase = '\tTEST PassPHrASe ';
controller.passConfirmSubmit();
expect(controller.passphrase).to.equal('test passphrase');
>>>>>>>
// OK
describe('componentController.passConfirmSubmit()', () => {
it('sets this.phassphrase as this.input_passphrase processed by normalizer', () => {
controller.input_passphrase = '\tTEST PassPHrASe ';
controller.passConfirmSubmit();
expect(controller.passphrase).to.equal('test passphrase');
<<<<<<<
const spy = sinon.spy($state, 'go');
controller.doTheLogin();
expect(spy).to.have.been.calledWith('main');
=======
const spy = sinon.spy(controller, '$timeout');
controller.passConfirmSubmit();
expect(spy).to.have.been.calledWith(controller.onLogin);
>>>>>>>
const spy = sinon.spy($state, 'go');
controller.doTheLogin();
expect(spy).to.have.been.calledWith('main'); |
<<<<<<<
<section>
<Input className='message' multiline label={this.props.t('Message')}
autoFocus={true}
value={this.state.message}
onChange={this.sign.bind(this)} />
<AuthInputs
passphrase={this.state.passphrase}
secondPassphrase={this.state.secondPassphrase}
onChange={this.handleChange.bind(this)} />
</section>
{this.state.resultIsShown ?
<SignVerifyResult result={this.state.result} title={this.props.t('Result')} /> :
<ActionBar
secondaryButton={{
onClick: this.props.closeDialog,
}}
primaryButton={{
label: this.props.t('Sign and copy result to clipboard'),
className: 'sign-button',
disabled: (!this.state.result ||
this.state.resultIsShown ||
!authStateIsValid(this.state)),
onClick: this.showResult.bind(this),
}} />
}
=======
<form onSubmit={this.showResult.bind(this)}>
<section>
<Input className='message' multiline label='Message'
autoFocus={true}
value={this.state.message}
onChange={this.sign.bind(this)} />
<AuthInputs
passphrase={this.state.passphrase}
secondPassphrase={this.state.secondPassphrase}
onChange={this.handleChange.bind(this)} />
</section>
{this.state.resultIsShown ?
<SignVerifyResult result={this.state.result} title='Result' /> :
<ActionBar
secondaryButton={{
onClick: this.props.closeDialog,
}}
primaryButton={{
label: 'Sign and copy result to clipboard',
className: 'sign-button',
type: 'submit',
disabled: (!this.state.result ||
this.state.resultIsShown ||
!authStateIsValid(this.state)),
}} />
}
</form>
>>>>>>>
<form onSubmit={this.showResult.bind(this)}>
<section>
<Input className='message' multiline label={this.props.t('Message')}
autoFocus={true}
value={this.state.message}
onChange={this.sign.bind(this)} />
<AuthInputs
passphrase={this.state.passphrase}
secondPassphrase={this.state.secondPassphrase}
onChange={this.handleChange.bind(this)} />
</section>
{this.state.resultIsShown ?
<SignVerifyResult result={this.state.result} title={this.props.t('Result')} /> :
<ActionBar
secondaryButton={{
onClick: this.props.closeDialog,
}}
primaryButton={{
label: this.props.t('Sign and copy result to clipboard'),
className: 'sign-button',
type: 'submit',
disabled: (!this.state.result ||
this.state.resultIsShown ||
!authStateIsValid(this.state)),
}} />
}
</form> |
<<<<<<<
const network = Object.assign({}, getNetwork(this.props.network));
// set active peer
this.props.liskAPIClientSet({
=======
this.props.activePeerSet({
>>>>>>>
// set active peer
this.props.liskAPIClientSet({ |
<<<<<<<
passphrase: accountWithSecondPassphrase.passphrase,
votedList: props.votedList,
unvotedList: props.unvotedList,
=======
votes,
>>>>>>>
votes,
passphrase: accountWithSecondPassphrase.passphrase, |
<<<<<<<
require('../src/components/toaster/stories');
=======
require('../src/components/send/stories');
>>>>>>>
require('../src/components/toaster/stories');
require('../src/components/send/stories'); |
<<<<<<<
import addedTransactionMiddleware from './addedTransaction';
=======
import loadingBarMiddleware from './loadingBar';
>>>>>>>
import addedTransactionMiddleware from './addedTransaction';
import loadingBarMiddleware from './loadingBar'; |
<<<<<<<
import './services/account';
=======
import './services/delegateService';
>>>>>>>
import './services/account';
import './services/delegateService'; |
<<<<<<<
const I18nScannerPlugin = require('../src/i18n-scanner');
=======
const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
>>>>>>>
const I18nScannerPlugin = require('../src/i18n-scanner');
const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
<<<<<<<
new I18nScannerPlugin({
translationFunctionNames: ['i18next.t', 'props.t', 'this.props.t', 't'],
outputFilePath: './i18n/locales/en/common.json',
files: [
'./src/**/*.js',
'./app/src/**/*.js',
],
}),
=======
new HardSourceWebpackPlugin(),
>>>>>>>
new I18nScannerPlugin({
translationFunctionNames: ['i18next.t', 'props.t', 'this.props.t', 't'],
outputFilePath: './i18n/locales/en/common.json',
files: [
'./src/**/*.js',
'./app/src/**/*.js',
],
}),
new HardSourceWebpackPlugin(), |
<<<<<<<
<PageLayout>
<TransactionsTable isLoadMoreEnabled filters={filters} columns={columns} title={t('All transactions')} transactions={transactions} />
</PageLayout>
=======
<div>
<MonitorHeader />
<TransactionsTable isLoadMoreEnabled columns={columns} title={t('All transactions')} transactions={transactions} />
</div>
>>>>>>>
<div>
<MonitorHeader />
<TransactionsTable isLoadMoreEnabled filters={filters} columns={columns} title={t('All transactions')} transactions={transactions} />
</div> |
<<<<<<<
<div className={`${grid['col-md-6']} ${grid['col-lg-6']} ${grid['col-xs-6']}`} style={{ paddingLeft: '0px' }}>
<Box className={`${styles.following} bookmarks`}>
<FollowedAccounts history={history}/>
</Box>
<ExtensionPoint identifier={LiskHubExtensions.identifiers.dashboardColumn1} />
=======
<div className={`${styles.following} bookmarks`}>
<FollowedAccounts history={history}/>
>>>>>>>
<div className={`${styles.following} bookmarks`}>
<FollowedAccounts history={history}/>
<ExtensionPoint identifier={LiskHubExtensions.identifiers.dashboardColumn1} />
<<<<<<<
</Box>
<ExtensionPoint identifier={LiskHubExtensions.identifiers.dashboardColumn2} />
=======
</div>
>>>>>>>
<ExtensionPoint identifier={LiskHubExtensions.identifiers.dashboardColumn2} />
</div> |
<<<<<<<
import FilterDropdownButton from '../filterDropdownButton';
import liskServiceApi from '../../../utils/api/lsk/liskService';
=======
import withResizeValues from '../../../utils/withResizeValues';
>>>>>>>
import FilterDropdownButton from '../filterDropdownButton';
import liskServiceApi from '../../../utils/api/lsk/liskService';
import withResizeValues from '../../../utils/withResizeValues';
<<<<<<<
this.handleResize = this.handleResize.bind(this);
this.saveFilters = this.saveFilters.bind(this);
=======
>>>>>>>
this.handleResize = this.handleResize.bind(this);
this.saveFilters = this.saveFilters.bind(this);
<<<<<<<
title, transactions, columns, isLoadMoreEnabled, t, fields, filters,
=======
title, transactions, columns, isLoadMoreEnabled, t, emptyStateMessage,
>>>>>>>
title, transactions, columns, isLoadMoreEnabled, t, fields, filters, emptyStateMessage,
<<<<<<<
<Box width="full" isLoading={transactions.isLoading}>
<Box.Header className={styles.boxHeader}>
=======
<Box width="full" isLoading={transactions.isLoading} className="transactions-box">
<Box.Header>
>>>>>>>
<Box width="full" isLoading={transactions.isLoading} className="transactions-box">
<Box.Header className={styles.boxHeader}> |
<<<<<<<
=======
import LoadingBar from '../loadingBar';
>>>>>>>
import LoadingBar from '../loadingBar';
<<<<<<<
<Toaster />
=======
<LoadingBar />
>>>>>>>
<Toaster />
<LoadingBar /> |
<<<<<<<
import { Route, Link } from 'react-router-dom';
=======
import { BrowserRouter as Router, Route, Link } from 'react-router-dom';
>>>>>>>
import { Route, Link } from 'react-router-dom';
<<<<<<<
<section className={styles['body-wrapper']}>
<Header account={state.account.account} />
<main className=''>
<Route path="/main" render={({ match }) => (
<main className=''>
<Account {...state.account}></Account>
<Route path={`${match.url}/transactions`} component={Transactions}/>
<Route path={`${match.url}/voting`} component={Voting}/>
<Route path={`${match.url}/forging`} component={Forging}/>
</main>
)} />
<Route exact path="/" component={Login} />
</main>
=======
<Router>
<section className={styles['body-wrapper']}>
<Header />
<main className=''>
<Route path="/main" render={({ match }) => (
<main className=''>
<Account></Account>
<Route path={`${match.url}/transactions`} component={Transactions}/>
<Route path={`${match.url}/voting`} component={Voting}/>
<Route path={`${match.url}/forging`} component={Forging}/>
</main>
)} />
<Route exact path="/" component={Login} />
</main>
>>>>>>>
<section className={styles['body-wrapper']}>
<Header />
<main className=''>
<Route path="/main" render={({ match }) => (
<main className=''>
<Account />
<Route path={`${match.url}/transactions`} component={Transactions}/>
<Route path={`${match.url}/voting`} component={Voting}/>
<Route path={`${match.url}/forging`} component={Forging}/>
</main>
)} />
<Route exact path="/" component={Login} />
</main> |
<<<<<<<
export const getVotes = (network, { address }) =>
getAPIClient(network).votes.get({ address, limit: 101, offset: 0 });
=======
export const getVotes = (networkConfig, { address }) =>
getAPIClient(networkConfig).votes.get({ address, limit: 10, offset: 0 });
>>>>>>>
export const getVotes = (network, { address }) =>
getAPIClient(network).votes.get({ address, limit: 10, offset: 0 }); |
<<<<<<<
import { SYNC_ACTIVE_INTERVAL, SYNC_INACTIVE_INTERVAL } from '../../constants/api';
=======
import { clearVoteLists } from '../../actions/voting';
>>>>>>>
import { SYNC_ACTIVE_INTERVAL, SYNC_INACTIVE_INTERVAL } from '../../constants/api';
import { clearVoteLists } from '../../actions/voting'; |
<<<<<<<
import settingsIcon from '../assets/images/icons-v2/settings.svg';
import transactionError from '../assets/images/icons-v2/transactionError.svg';
import transactionsDelegateIcon from '../assets/images/icons-v2/icon_delegate_vote.svg';
import transactionsSendIcon from '../assets/images/icons-v2/icon_transaction.svg';
import transactionSuccess from '../assets/images/icons-v2/transactionSuccess.svg';
=======
import logoutIcon from '../assets/images/icons-v2/logout.svg';
import logoutActiveIcon from '../assets/images/icons-v2/logout-active.svg';
import iconWalletDetails from '../assets/images/icons-v2/icon-wallet-details.svg';
import txDelegate from '../assets/images/icons-v2/tx-delegate.svg';
import txVote from '../assets/images/icons-v2/tx-vote.svg';
>>>>>>>
import settingsIcon from '../assets/images/icons-v2/settings.svg';
import transactionError from '../assets/images/icons-v2/transactionError.svg';
import transactionsDelegateIcon from '../assets/images/icons-v2/icon_delegate_vote.svg';
import transactionsSendIcon from '../assets/images/icons-v2/icon_transaction.svg';
import transactionSuccess from '../assets/images/icons-v2/transactionSuccess.svg';
import iconWalletDetails from '../assets/images/icons-v2/icon-wallet-details.svg'; |
<<<<<<<
import './services/passphrase';
=======
import './services/sign-verify';
>>>>>>>
import './services/passphrase';
import './services/sign-verify'; |
<<<<<<<
import links from './../../constants/externalLinks';
=======
import Piwik from '../../utils/piwik';
>>>>>>>
import links from './../../constants/externalLinks';
import Piwik from '../../utils/piwik'; |
<<<<<<<
// './registerDelegate.test.js',
'./transactionID.test.js',
=======
'./registerDelegate.test.js',
// './transactionID.test.js',
>>>>>>>
// './registerDelegate.test.js',
// './transactionID.test.js', |
<<<<<<<
=======
import PrivateWrapper from '../privateWrapper';
import ReceiveButton from '../receiveButton';
import RegisterDelegate from '../registerDelegate';
import SecondPassphraseMenu from '../secondPassphrase';
import Send from '../send';
import SignMessage from '../signMessage';
import VerifyMessage from '../verifyMessage';
>>>>>>>
import PrivateWrapper from '../privateWrapper';
<<<<<<<
import PrivateWrapper from '../privateWrapper';
import RelativeLink from '../relativeLink';
=======
import languages from '../../constants/languages';
>>>>>>>
import RelativeLink from '../relativeLink';
import languages from '../../constants/languages';
<<<<<<<
<Button className={`${styles.button} logout-button`} raised onClick={props.logOut}>{props.t('logout')}</Button>
<RelativeLink neutral raised className={`${styles.button} receive-button`}
to='receive'>{props.t('Receive LSK')}</RelativeLink>
<RelativeLink primary raised disableWhenOffline className={`${styles.button} send-button`}
to='send'>{props.t('send')}</RelativeLink>
=======
<Button className={`${styles.button} logout-button`} raised onClick={props.logOut}>{props.t('Logout')}</Button>
<ReceiveButton className={styles.button} label='Receive' />
<Button className={`${styles.button} send-button ${offlineStyle.disableWhenOffline}`}
raised primary
onClick={() => props.setActiveDialog({
title: props.t('Send'),
childComponent: Send,
})}>{props.t('Send')}</Button>
<IconMenu
selectable={true}
selected={i18n.language}
className={`${styles.iconButton} ${offlineStyle.disableWhenOffline}`}
icon='language' position='topRight'>
{Object.keys(languages).map(key => (
<MenuItem key={key} value={key} caption={languages[key]}
onClick={() => i18n.changeLanguage(key)} />
))}
</IconMenu>
>>>>>>>
<Button className={`${styles.button} logout-button`} raised onClick={props.logOut}>{props.t('logout')}</Button>
<RelativeLink neutral raised className={`${styles.button} receive-button`}
to='receive'>{props.t('Receive LSK')}</RelativeLink>
<RelativeLink primary raised disableWhenOffline className={`${styles.button} send-button`}
to='send'>{props.t('send')}</RelativeLink>
<IconMenu
selectable={true}
selected={i18n.language}
className={`${styles.iconButton} ${offlineStyle.disableWhenOffline}`}
icon='language' position='topRight'>
{Object.keys(languages).map(key => (
<MenuItem key={key} value={key} caption={languages[key]}
onClick={() => i18n.changeLanguage(key)} />
))}
</IconMenu> |
<<<<<<<
import PassphraseVerifier from './passphraseVerifier';
=======
import PassphraseConfirmator from './passphraseConfirmator';
import ActionBar from '../actionBar';
>>>>>>>
import PassphraseVerifier from './passphraseVerifier';
import ActionBar from '../actionBar';
<<<<<<<
<section className={`${grid.row} ${grid['between-xs']}`}>
<Button label={this.state.steps[this.state.currentStep].cancelButton.title}
className={`${styles.cancel} cancel-button`}
onClick={this.state.steps[this.state.currentStep].cancelButton.onClick.bind(this)} />
<PrimaryButton
label={this.state.steps[this.state.currentStep].confirmButton.title()}
balance={this.props.account.balance}
fee={this.state.steps[this.state.currentStep].confirmButton.fee()}
className={`${styles.approve} next-button`}
disabled={(this.state.currentStep === 'generate' && !this.state.passphrase) ||
(this.state.currentStep === 'confirm' && !this.state.answer)}
onClick={this.state.steps[this.state.currentStep].confirmButton.onClick.bind(this)}/>
</section>
=======
<ActionBar
secondaryButton={{
label: this.state.steps[this.state.currentStep].cancelButton.title,
onClick: this.state.steps[this.state.currentStep].cancelButton.onClick.bind(this),
}}
primaryButton={{
label: this.state.steps[this.state.currentStep].confirmButton.title,
className: 'next-button',
disabled: (this.state.currentStep === 'generate' && !this.state.passphrase) ||
(this.state.currentStep === 'confirm' && !this.state.answer),
onClick: this.state.steps[this.state.currentStep].confirmButton.onClick.bind(this),
}} />
>>>>>>>
<ActionBar
secondaryButton={{
label: this.state.steps[this.state.currentStep].cancelButton.title,
onClick: this.state.steps[this.state.currentStep].cancelButton.onClick.bind(this),
}}
primaryButton={{
label: this.state.steps[this.state.currentStep].confirmButton.title(),
fee: this.state.steps[this.state.currentStep].confirmButton.fee(),
balance: this.props.account.balance,
className: 'next-button',
disabled: (this.state.currentStep === 'generate' && !this.state.passphrase) ||
(this.state.currentStep === 'confirm' && !this.state.answer),
onClick: this.state.steps[this.state.currentStep].confirmButton.onClick.bind(this),
}} /> |
<<<<<<<
showNetwork: false,
=======
currency: settingsConst.currencies[0],
>>>>>>>
showNetwork: false,
currency: settingsConst.currencies[0],
<<<<<<<
it('should change showNetwork setting when clicking on checkbox', () => {
wrapper.find('.showNetwork').at(0).find('input').simulate('change', { target: { checked: true, value: true } });
clock.tick(300);
wrapper.update();
const expectedCallToSettingsUpdated = {
showNetwork: !settings.showNetwork,
};
expect(props.settingsUpdated).to.have.been.calledWith(expectedCallToSettingsUpdated);
});
=======
it('should change active currency setting to EUR', () => {
wrapper.find('.currency').at(1).simulate('click');
wrapper.update();
const expectedCallToSettingsUpdated = {
currency: settingsConst.currencies[1],
};
expect(props.settingsUpdated).to.have.been.calledWith(expectedCallToSettingsUpdated);
});
>>>>>>>
it('should change showNetwork setting when clicking on checkbox', () => {
wrapper.find('.showNetwork').at(0).find('input').simulate('change', { target: { checked: true, value: true } });
clock.tick(300);
wrapper.update();
const expectedCallToSettingsUpdated = {
showNetwork: !settings.showNetwork,
};
expect(props.settingsUpdated).to.have.been.calledWith(expectedCallToSettingsUpdated);
});
it('should change active currency setting to EUR', () => {
wrapper.find('.currency').at(1).simulate('click');
wrapper.update();
const expectedCallToSettingsUpdated = {
currency: settingsConst.currencies[1],
};
expect(props.settingsUpdated).to.have.been.calledWith(expectedCallToSettingsUpdated);
}); |
<<<<<<<
=======
import TransactionSummary from '../../transactionSummary';
import { create } from '../../../utils/api/lsk/transactions';
import { createTransactionType } from '../../../constants/transactionTypes';
>>>>>>>
import { create } from '../../../utils/api/lsk/transactions';
import { createTransactionType } from '../../../constants/transactionTypes';
<<<<<<<
userInfo: {
account: account.info.LSK,
username: nickname,
passphrase: account.passphrase,
secondPassphrase: secondPassphrase.value,
},
=======
account,
username: nickname,
passphrase: account.passphrase,
secondPassphrase,
>>>>>>>
account,
username: nickname,
passphrase: account.passphrase,
secondPassphrase: secondPassphrase.value,
<<<<<<<
<div className={`${styles.wrapper} summary-container`}>
<header className={`${styles.header} summary-header`}>
<h1>{t('Become a delegate summary')}</h1>
</header>
<div className={`${styles.content} summary-content`}>
<div className={styles.row}>
<label className={'nickname-label'}>{t('Your nickname')}</label>
<div className={styles.userInformation}>
<AccountVisual address={account.info.LSK.address} size={25} />
<span className={`${styles.nickname} nickname`}>{nickname}</span>
<span className={`${styles.address} address`}>{account.info.LSK.address}</span>
</div>
</div>
<div className={styles.row}>
<label>{t('Transaction fee')}</label>
<span className={styles.feeInformation}>{t('{{fee}} LSK', { fee: fromRawLsk(Fees.registerDelegate) })}</span>
</div>
{
secondPassphrase.hasSecondPassphrase
? <div className={`${styles.row} summary-second-passphrase`}>
<label>{t('Second passphrase')}</label>
<PassphraseInputV2
isSecondPassphrase={secondPassphrase.hasSecondPassphrase}
secondPPFeedback={secondPassphrase.feedback}
inputsLength={12}
maxInputsLength={24}
onFill={this.checkSecondPassphrase} />
</div>
: null
}
</div>
<footer className={'summary-footer'}>
<PrimaryButtonV2
className={`${styles.confirmBtn} confirm-button`}
onClick={this.onSubmit}
disabled={secondPassphrase.hasSecondPassphrase && !secondPassphrase.isValid}>
{t('Become a delegate')}
</PrimaryButtonV2>
<TertiaryButtonV2
className={`${styles.editBtn} cancel-button`}
onClick={() => prevStep({ nickname })}>
{t('Go back')}
</TertiaryButtonV2>
</footer>
</div>
=======
<TransactionSummary
title={t('Become a delegate summary')}
t={t}
account={account}
confirmButton={onConfirmAction}
cancelButton={onCancelAction}
fee={fromRawLsk(Fees.registerDelegate)}
classNames={styles.summaryContainer}
>
<section className={'summary-container'}>
<label className={'nickname-label'}>{t('Your nickname')}</label>
<label className={styles.userInformation}>
<AccountVisual
className={styles.accountVisual}
address={account.address}
size={23}
/>
<span className={`${styles.nickname} nickname`}>{nickname}</span>
<span className={`${styles.address} address`}>{account.address}</span>
</label>
</section>
</TransactionSummary>
>>>>>>>
<div className={`${styles.wrapper} summary-container`}>
<header className={`${styles.header} summary-header`}>
<h1>{t('Become a delegate summary')}</h1>
</header>
<div className={`${styles.content} summary-content`}>
<div className={styles.row}>
<label className={'nickname-label'}>{t('Your nickname')}</label>
<div className={styles.userInformation}>
<AccountVisual address={account.address} size={25} />
<span className={`${styles.nickname} nickname`}>{nickname}</span>
<span className={`${styles.address} address`}>{account.address}</span>
</div>
</div>
<div className={styles.row}>
<label>{t('Transaction fee')}</label>
<span className={styles.feeInformation}>{t('{{fee}} LSK', { fee: fromRawLsk(Fees.registerDelegate) })}</span>
</div>
{
secondPassphrase.hasSecondPassphrase
? <div className={`${styles.row} summary-second-passphrase`}>
<label>{t('Second passphrase')}</label>
<PassphraseInputV2
isSecondPassphrase={secondPassphrase.hasSecondPassphrase}
secondPPFeedback={secondPassphrase.feedback}
inputsLength={12}
maxInputsLength={24}
onFill={this.checkSecondPassphrase} />
</div>
: null
}
</div>
<footer className={'summary-footer'}>
<PrimaryButtonV2
className={`${styles.confirmBtn} confirm-button`}
onClick={this.onSubmit}
disabled={secondPassphrase.hasSecondPassphrase && !secondPassphrase.isValid}>
{t('Become a delegate')}
</PrimaryButtonV2>
<TertiaryButtonV2
className={`${styles.editBtn} cancel-button`}
onClick={() => prevStep({ nickname })}>
{t('Go back')}
</TertiaryButtonV2>
</footer>
</div> |
<<<<<<<
Given('I\'m logged in as "{accountName}"'{ timeout: 2 * defaultTimeout }, (accountName, callback) => {
=======
When('I clear "{elementName}" field', (elementName) => {
const selectorClass = `.${elementName.replace(/ /g, '-')}`;
browser.executeScript(`window.document.querySelector("${selectorClass} input, ${selectorClass} textarea").value = "";`);
});
Given('I\'m logged in as "{accountName}"', (accountName, callback) => {
>>>>>>>
When('I clear "{elementName}" field', (elementName) => {
const selectorClass = `.${elementName.replace(/ /g, '-')}`;
browser.executeScript(`window.document.querySelector("${selectorClass} input, ${selectorClass} textarea").value = "";`);
});
Given('I\'m logged in as "{accountName}"', { timeout: 2 * defaultTimeout }, (accountName, callback) => { |
<<<<<<<
import { MAX_BLOCKS_FORGED } from '../../../../constants/delegates';
=======
import { tokenMap } from '../../../../constants/tokens';
>>>>>>>
import { MAX_BLOCKS_FORGED } from '../../../../constants/delegates';
import { tokenMap } from '../../../../constants/tokens';
<<<<<<<
{ network: networks.LSK, params: { ...params, limit: MAX_BLOCKS_FORGED } },
=======
{ network: networks.LSK, params: { ...params, limit: numberOfActiveDelegates } },
>>>>>>>
{ network: networks.LSK, params: { ...params, limit: MAX_BLOCKS_FORGED } },
<<<<<<<
transformResponse: response => transformDelegatesResponse({
data: response.data.filter(
delegate => delegate.rank > MAX_BLOCKS_FORGED,
),
=======
transformResponse: (response, oldData) => transformDelegatesResponse({
data: response.data.filter(delegate => delegate.status === 'standby'),
>>>>>>>
transformResponse: (response, oldData) => transformDelegatesResponse({
data: response.data.filter(delegate => delegate.status === 'standby'), |
<<<<<<<
monitorTransactions: {
path: '/monitor/transactions',
component: MonitorTransactions,
isPrivate: false,
},
=======
blockDetails: {
path: '/monitor/blocks',
pathSuffix: '/:id?',
component: BlockDetails,
isPrivate: false,
},
>>>>>>>
monitorTransactions: {
path: '/monitor/transactions',
component: MonitorTransactions,
isPrivate: false,
},
blockDetails: {
path: '/monitor/blocks',
pathSuffix: '/:id?',
component: BlockDetails,
isPrivate: false,
}, |
<<<<<<<
// '<rootDir>/src/store/middlewares/account.test.js',
'<rootDir>/src/store/middlewares/followedAccounts.test.js',
=======
'<rootDir>/src/store/middlewares/account.test.js',
// '<rootDir>/src/store/middlewares/followedAccounts.test.js',
>>>>>>>
'<rootDir>/src/store/middlewares/account.test.js',
'<rootDir>/src/store/middlewares/followedAccounts.test.js', |
<<<<<<<
import { connect } from 'react-redux';
=======
import { toastr } from 'react-redux-toastr';
import grid from 'flexboxgrid/dist/flexboxgrid.css';
>>>>>>>
import { connect } from 'react-redux';
import grid from 'flexboxgrid/dist/flexboxgrid.css';
<<<<<<<
import grid from '../../../node_modules/flexboxgrid/dist/flexboxgrid.css';
=======
>>>>>>> |
<<<<<<<
network: networks.mainnet.code,
liskAPIClientSet: spy(),
=======
network: networks.mainnet,
activePeerSet: spy(),
>>>>>>>
network: networks.mainnet,
liskAPIClientSet: spy(),
<<<<<<<
expect(prop.liskAPIClientSet).to.have.been.calledWith(match({
network: networks.mainnet,
=======
expect(prop.activePeerSet).to.have.been.calledWith(match({
>>>>>>>
expect(prop.liskAPIClientSet).to.have.been.calledWith(match({ |
<<<<<<<
if(file["scrollLeft"] != null && file["scrollLeft"] > 0){
$("#luckysheet-scrollbar-x").scrollLeft(file["scrollLeft"]);
}
else{
$("#luckysheet-scrollbar-x").scrollLeft(0);
}
if(file["scrollTop"] != null && file["scrollTop"] > 0){
$("#luckysheet-scrollbar-y").scrollTop(file["scrollTop"]);
}
else{
$("#luckysheet-scrollbar-y").scrollTop(0);
}
=======
>>>>>>>
if(file["scrollLeft"] != null && file["scrollLeft"] > 0){
$("#luckysheet-scrollbar-x").scrollLeft(file["scrollLeft"] * Store.zoomRatio);
}
else{
$("#luckysheet-scrollbar-x").scrollLeft(0);
}
if(file["scrollTop"] != null && file["scrollTop"] > 0){
$("#luckysheet-scrollbar-y").scrollTop(file["scrollTop"] * Store.zoomRatio);
}
else{
$("#luckysheet-scrollbar-y").scrollTop(0);
} |
<<<<<<<
const props = {
address: accounts.genesis.address,
account: accounts.genesis,
match: { params: { address: accounts.genesis.address } },
history: { push: jest.fn(), location: { search: ' ' } },
followedAccounts: [],
transactionsCount: 1000,
transaction: transactions[0],
transactions,
transactionsRequested: jest.fn(),
transactionsFilterSet: jest.fn(),
loadLastTransaction: jest.fn(),
updateAccountDelegateStats: jest.fn(),
addFilter: jest.fn(),
loading: [],
wallets: {},
peers: { options: { code: 0 } },
t: key => key,
};
=======
beforeEach(() => {
props = {
address: accounts.genesis.address,
account: accounts.genesis,
match: { params: { address: accounts.genesis.address } },
history: { push: spy(), location: { search: ' ' } },
followedAccounts: [],
transactionsCount: 1000,
transaction: transactions[0],
transactions,
transactionsRequested: spy(),
transactionsFilterSet: spy(),
loadLastTransaction: spy(),
addFilter: spy(),
loading: [],
wallets: {},
peers: { options: { code: 0 } },
t: key => key,
hideChart: true, // Props to hide chart on tests, due to no canvas support
};
>>>>>>>
const props = {
address: accounts.genesis.address,
account: accounts.genesis,
match: { params: { address: accounts.genesis.address } },
history: { push: jest.fn(), location: { search: ' ' } },
followedAccounts: [],
transactionsCount: 1000,
transaction: transactions[0],
transactions,
transactionsRequested: jest.fn(),
transactionsFilterSet: jest.fn(),
loadLastTransaction: jest.fn(),
updateAccountDelegateStats: jest.fn(),
addFilter: jest.fn(),
loading: [],
wallets: {},
peers: { options: { code: 0 } },
t: key => key,
hideChart: true, // Props to hide chart on tests, due to no canvas support
}; |
<<<<<<<
import iconEdit from '../assets/images/icons-v2/icon_edit.svg';
=======
import btcIcon from '../assets/images/icons-v2/icon-btc-48.svg';
>>>>>>>
import iconEdit from '../assets/images/icons-v2/icon_edit.svg';
import btcIcon from '../assets/images/icons-v2/icon-btc-48.svg';
<<<<<<<
icon_edit: iconEdit,
=======
btcIcon,
>>>>>>>
icon_edit: iconEdit,
btcIcon, |
<<<<<<<
(this.props.voted.length +
(this.props.votedList.length -
this.props.unvotedList.length) > 101) ||
(this.props.votedList.length +
this.props.unvotedList.length > 33) ||
(this.props.votedList.length === 0 &&
this.props.unvotedList.length === 0) ||
!authStateIsValid(this.state)
=======
totalVotes > 101 ||
votesList.length === 0 ||
votesList.length > 33 ||
(!!this.state.secondPassphrase.error ||
this.state.secondPassphrase.value === '')
>>>>>>>
totalVotes > 101 ||
votesList.length === 0 ||
votesList.length > 33 ||
!authStateIsValid(this.state) |
<<<<<<<
getTitle() {
return this.props.account.hwInfo && this.props.account.hwInfo.deviceId ?
<h2>{this.props.t('Confirm transaction on Ledger Nano S')}</h2> : <h2>{this.props.t('Send LSK')}</h2>;
}
=======
onPrevStep() {
Piwik.trackingEvent('Send_Form', 'button', 'Previous step');
this.props.goToWallet();
}
onNextStep() {
Piwik.trackingEvent('Send_Form', 'button', 'Next step');
this.props.nextStep({
recipient: this.state.recipient.value,
amount: this.state.amount.value,
reference: this.state.reference.value,
});
}
>>>>>>>
getTitle() {
return this.props.account.hwInfo && this.props.account.hwInfo.deviceId ?
<h2>{this.props.t('Confirm transaction on Ledger Nano S')}</h2> : <h2>{this.props.t('Send LSK')}</h2>;
}
onPrevStep() {
Piwik.trackingEvent('Send_Form', 'button', 'Previous step');
this.props.goToWallet();
}
onNextStep() {
Piwik.trackingEvent('Send_Form', 'button', 'Next step');
this.props.nextStep({
recipient: this.state.recipient.value,
amount: this.state.amount.value,
reference: this.state.reference.value,
});
} |
<<<<<<<
className={`${styles.newAccount} new-account-button`}>
{this.props.t('New Account')}
</RelativeLink>
<Button label={this.props.t('Login')} primary raised
onClick={this.onLoginSubmission.bind(this, this.state.passphrase)}
=======
className={`${styles.newAccount} new-account-button`}>{this.props.t('New Account')}</RelativeLink>
<Button label='LOGIN' primary raised
>>>>>>>
className={`${styles.newAccount} new-account-button`}>
{this.props.t('New Account')}
</RelativeLink>
<Button label={this.props.t('Login')} primary raised |
<<<<<<<
import { getIndexOfFollowedAccount } from '../../../utils/followedAccounts';
=======
import { getIndexOfBookmark } from '../../../utils/bookmarks';
import { getTokenFromAddress } from '../../../utils/api/transactions';
>>>>>>>
import { getIndexOfBookmark } from '../../../utils/bookmarks';
<<<<<<<
followedAccounts, address, t, delegate = {}, activeToken, detailAccount,
=======
bookmarks, address, t, delegate = {}, detailAccount,
>>>>>>>
bookmarks, address, t, delegate = {}, activeToken, detailAccount,
<<<<<<<
const isFollowing = getIndexOfFollowedAccount(followedAccounts, {
address, token: activeToken,
}) !== -1;
=======
const isBookmark = getIndexOfBookmark(bookmarks, { address, token }) !== -1;
>>>>>>>
const isBookmark = getIndexOfBookmark(bookmarks, {
address, token: activeToken,
}) !== -1;
<<<<<<<
token={activeToken}
followedAccounts={followedAccounts}
=======
token={token}
bookmarks={bookmarks}
>>>>>>>
token={activeToken}
bookmarks={bookmarks}
<<<<<<<
showDropdown={this.state.shownDropdown === 'followDropdown'}
className={`${styles.followDropdown}`}>
<FollowAccount
token={activeToken}
=======
showDropdown={this.state.shownDropdown === 'bookmarkDropdown'}
className={`${styles.bookmarkDropdown}`}>
<Bookmark
token={token}
>>>>>>>
showDropdown={this.state.shownDropdown === 'bookmarkDropdown'}
className={`${styles.followDropdown}`}>
<Bookmark
token={activeToken} |
<<<<<<<
describe('ConfirmVotesContainer', () => {
it('should render ConfirmVotes', () => {
const wrapper = mount(<ConfirmVotesContainer {...props} store={store} />, {
=======
describe('ConfrimVotesContainer', () => {
it('should render ConfrimVotes', () => {
store.getState = () => ({
peers: {},
voting: {
votedList: [],
unvotedList: [],
},
account: {},
});
const wrapper = mount(<ConfrimVotesContainer {...props} store={store} />, {
>>>>>>>
describe('ConfirmVotesContainer', () => {
it('should render ConfirmVotes', () => {
store.getState = () => ({
peers: {},
voting: {
votedList: [],
unvotedList: [],
},
account: {},
});
const wrapper = mount(<ConfirmVotesContainer {...props} store={store} />, {
<<<<<<<
describe('ConfirmVotes', () => {
=======
describe('ConfrimVotes', () => {
>>>>>>>
describe('ConfirmVotes', () => { |
<<<<<<<
// './actions/account.test.js',
'./actions/loding.test.js',
// './actions/followedAccounts.test.js',
=======
'./actions/account.test.js',
// './actions/loding.test.js',
'./actions/followedAccounts.test.js',
>>>>>>>
// './actions/account.test.js',
// './actions/loding.test.js',
// './actions/followedAccounts.test.js',
<<<<<<<
'./actions/peers.test.js',
// './actions/delegate.test.js',
'./actions/setting.test.js',
'./store/middlewares/savedAccounts.test.js',
'./store/middlewares/socket.test.js',
'./store/middlewares/savedSettings.test.js',
'./store/middlewares/offline.test.js',
'./store/middlewares/notification.test.js',
'./store/middlewares/voting.test.js',
=======
// './actions/peers.test.js',
'./actions/delegate.test.js',
// './actions/setting.test.js',
// './store/middlewares/savedAccounts.test.js',
// './store/middlewares/socket.test.js',
// './store/middlewares/savedSettings.test.js',
// './store/middlewares/offline.test.js',
// './store/middlewares/notification.test.js',
// './store/middlewares/voting.test.js',
>>>>>>>
// './actions/peers.test.js',
// './actions/delegate.test.js',
// './actions/setting.test.js',
// './store/middlewares/savedAccounts.test.js',
// './store/middlewares/socket.test.js',
// './store/middlewares/savedSettings.test.js',
// './store/middlewares/offline.test.js',
// './store/middlewares/notification.test.js',
// './store/middlewares/voting.test.js', |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.