conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
this.resources = new Container();
=======
this.resourceNode = svg.createNode('defs');
this.node.appendChild(this.resourceNode);
this.resources = new Parent();
>>>>>>>
this.resources = new Container();
this.resourceNode = svg.createNode('defs');
this.node.appendChild(this.resourceNode); |
<<<<<<<
dropFrames: 0,
addAnimation: function(chart, animationObject) {
=======
addAnimation: function(chartInstance, animationObject) {
>>>>>>>
dropFrames: 0,
addAnimation: function(chartInstance, animationObject) { |
<<<<<<<
define(function (require, exports, module) {
var utils = require('core/utils');
=======
define(function(require, exports, module) {
var Utils = require('core/utils');
>>>>>>>
define(function (require, exports, module) {
var Utils = require('core/utils');
<<<<<<<
});
return createClass('Path', {
=======
}),
PathUtils = {};
Utils.extend( PathUtils, {
//向给定的图形添加给定的属性
dumpAttributes: function ( shape, attrs ) {
var node = shape.node;
Utils.each( attrs, function ( val, key ) {
if ( val ) {
node.setAttribute( key, val );
} else {
node.removeAttribute( key );
}
} );
}
} );
return createClass( 'Path', {
>>>>>>>
});
var PathUtils = {};
Utils.extend(PathUtils, {
//向给定的图形添加给定的属性
dumpAttributes: function (shape, attrs) {
var node = shape.node;
Utils.each(attrs, function (val, key) {
if (val) {
node.setAttribute(key, val);
} else {
node.removeAttribute(key);
}
});
}
});
return createClass('Path', {
<<<<<<<
stroke: function (pen) {
pen.stroke(this);
=======
stroke: function( pen ) {
//根据画笔设置描边属性
PathUtils.dumpAttributes( this, {
stroke: pen.getColor().toRGB(),
'stroke-width': pen.getWidth(),
'stroke-opacity': pen.getOpacity() === 1 ? null : pen.getOpacity(),
'stroke-linecap': pen.getLineCap(),
'stroke-linejoin': pen.getLineJoin(),
'stroke-dasharray': pen.getDashArray() ? pen.getDashArray().join( ", " ) : null
} );
>>>>>>>
stroke: function (pen) {
//根据画笔设置描边属性
PathUtils.dumpAttributes(this, {
stroke: pen.getColor().toRGB(),
'stroke-width': pen.getWidth(),
'stroke-opacity': pen.getOpacity() === 1 ? null : pen.getOpacity(),
'stroke-linecap': pen.getLineCap(),
'stroke-linejoin': pen.getLineJoin(),
'stroke-dasharray': pen.getDashArray() ? pen.getDashArray().join(", ") : null
}); |
<<<<<<<
if (cluster.isMaster && config.NODE_ENV !== "test") {
var workers = [];
var spawn = function(i) {
workers[i] = cluster.fork();
// Optional: Restart worker on exit
workers[i].on('exit', function(worker, code, signal) {
console.log('respawning worker', i);
spawn(i);
});
};
// Spawn workers.
=======
if (cluster.isMaster) {
// Fork workers.
>>>>>>>
if (cluster.isMaster && config.NODE_ENV !== "test") { |
<<<<<<<
var moment = require('moment');
var config = require('../config');
=======
>>>>>>>
var moment = require('moment');
var config = require('../config'); |
<<<<<<<
"request":
{
"name": "Request"
},
"rankings":
{
"name": "Rankings"
},
"benchmarks":
{
"name": "Benchmarks"
},
"distributions":
{
"name": "Distributions"
},
"mmstats":
{
"name": "MMStats"
},
"search":
{
"name": "Search",
},
"status":
{
"name": "Status",
},
"blog":
{
"name": "Blog",
"path": "//blog.yasp.co"
},
"api":
{
"name": "API",
"path": "//swagger.yasp.co",
"new-feature": true,
},
"carry":
{
"name": "Carry"
},
=======
"request": {
"name": "Request"
},
"rankings": {
"name": "Rankings"
},
"benchmarks": {
"name": "Benchmarks"
},
"distributions": {
"name": "Distributions"
},
"mmstats": {
"name": "MMStats"
},
"carry": {
"name": "Carry"
},
"search": {
"name": "Search"
},
"become-the-gamer": {
"name": "In-Game Stats",
"sponsored": true
}
>>>>>>>
"request":
{
"name": "Request"
},
"rankings":
{
"name": "Rankings"
},
"benchmarks":
{
"name": "Benchmarks"
},
"distributions":
{
"name": "Distributions"
},
"mmstats":
{
"name": "MMStats"
},
"search":
{
"name": "Search",
},
"status":
{
"name": "Status",
},
"blog":
{
"name": "Blog",
"path": "//blog.yasp.co"
},
"api":
{
"name": "API",
"path": "//swagger.yasp.co",
"new-feature": true,
},
"carry":
{
"name": "Carry"
},
"become-the-gamer":
{
"name": "In-Game Stats",
"sponsored": true
}, |
<<<<<<<
return data;
}
// },
// {
// data: 'players[0].hero_damage',
// title: 'HD',
// visible: false,
// render: function(data, type) {
// return data;
// }
// },
// {
// data: 'players[0].tower_damage',
// title: 'TD',
// visible: false,
// render: function(data, type) {
// return data;
// }
// },
// {
// data: 'players[0].hero_healing',
// title: 'HH',
// visible: false,
// render: function(data, type) {
// return data;
// }
}, {
=======
return data;
}
},
// {
// data: 'players[0].hero_damage',
// title: 'HD',
// visible: false,
// render: function(data, type) {
// return data;
// }
// },
// {
// data: 'players[0].tower_damage',
// title: 'TD',
// visible: false,
// render: function(data, type) {
// return data;
// }
// },
// {
// data: 'players[0].hero_healing',
// title: 'HH',
// visible: false,
// render: function(data, type) {
// return data;
// },
{
>>>>>>>
return data;
}, |
<<<<<<<
//Fields to project from Cassandra player caches
var cacheProj = ['account_id', 'match_id', 'player_slot', 'version', 'start_time', 'duration', 'game_mode', 'lobby_type', 'radiant_win', 'hero_id', 'game_mode', 'skill', 'duration', 'kills', 'deaths', 'assists', 'last_hits', 'gold_per_min'];
var cacheFilters = ['lane_role', 'game_mode', 'lobby_type', 'region', 'patch', 'start_time', 'lane_role'];
=======
//Fields to project from Cassandra player caches
var cacheProj = ['account_id', 'match_id', 'player_slot', 'version', 'start_time', 'duration', 'game_mode', 'lobby_type', 'radiant_win', 'hero_id', 'game_mode', 'skill', 'duration', 'kills', 'deaths', 'assists', 'last_hits', 'gold_per_min'];
var cacheFilters = ['heroes', 'hero_id', 'lane_role', 'game_mode', 'lobby_type', 'region', 'patch', 'start_time', 'lane_role'];
>>>>>>>
//Fields to project from Cassandra player caches
var cacheProj = ['account_id', 'match_id', 'player_slot', 'version', 'start_time', 'duration', 'game_mode', 'lobby_type', 'radiant_win', 'hero_id', 'game_mode', 'skill', 'duration', 'kills', 'deaths', 'assists', 'last_hits', 'gold_per_min'];
var cacheFilters = ['heroes', 'hero_id', 'lane_role', 'game_mode', 'lobby_type', 'region', 'patch', 'start_time'];
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
//choose fields to project based on tab/filter, we need to project everything to build a new cache/toplist, otherwise optimize and do a subset
//queryObj.project = everything;
>>>>>>> |
<<<<<<<
async.map(data.response.players, insertPlayer, function(err) {
cb(err, job.data.payload);
=======
async.mapSeries(data.response.players, insertPlayer, function(err) {
cb(err);
>>>>>>>
async.mapSeries(data.response.players, insertPlayer, function(err) {
cb(err, job.data.payload); |
<<<<<<<
"RETRIEVER_SECRET": "", //string to use as shared secret with retriever/parser
"SESSION_SECRET": "secret to encrypt cookies with", //string to encrypt cookies
"ROOT_URL": "http://localhost:5000",
=======
"RETRIEVER_SECRET": "shared_secret_with_retriever",
"SESSION_SECRET": "secret to encrypt cookies with",
"ROOT_URL": "http://localhost:5000", //base url to redirect to after steam oauth login
>>>>>>>
"RETRIEVER_SECRET": "", //string to use as shared secret with retriever/parser
"SESSION_SECRET": "secret to encrypt cookies with", //string to encrypt cookies
"ROOT_URL": "http://localhost:5000", //base url to redirect to after steam oauth login |
<<<<<<<
angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'info', 'builder', 'containerLogs', 'containerTop', 'events'])
=======
angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'containersNetwork', 'images', 'image', 'startContainer', 'sidebar', 'info', 'builder', 'containerLogs', 'containerTop'])
>>>>>>>
angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'containersNetwork', 'images', 'image', 'startContainer', 'sidebar', 'info', 'builder', 'containerLogs', 'containerTop', 'events']) |
<<<<<<<
$routeProvider.when('/images/:id*/', {templateUrl: 'app/components/image/image.html', controller: 'ImageController'});
$routeProvider.when('/settings', {templateUrl: 'app/components/settings/settings.html', controller: 'SettingsController'});
=======
$routeProvider.when('/images/:id/', {templateUrl: 'app/components/image/image.html', controller: 'ImageController'});
$routeProvider.when('/info', {templateUrl: 'app/components/info/info.html', controller: 'InfoController'});
>>>>>>>
$routeProvider.when('/images/:id*/', {templateUrl: 'app/components/image/image.html', controller: 'ImageController'});
$routeProvider.when('/info', {templateUrl: 'app/components/info/info.html', controller: 'InfoController'}); |
<<<<<<<
price: 35.784,
=======
wkn: 'A14R7U',
price: 35.784,
>>>>>>>
wkn: 'A14R7U',
price: 35.784,
<<<<<<<
amount: 3578.4,
=======
amount: 3578.4,
tax: 0,
},
]);
});
test('should map pdf data of buy sample from 2015 (ISHS)', () => {
const activity = consorsbank.parsePages(buySamples[5]).activities;
expect(activity).toEqual([
{
broker: 'consorsbank',
type: 'Buy',
company: 'ISHS-EO CO.BD LA.C.UTS DZ',
date: '2015-08-03',
isin: 'DE0002511243',
wkn: '251124',
price: 133.2393168997759,
shares: 0.51764,
amount: 68.97,
>>>>>>>
amount: 3578.4,
tax: 0,
},
]);
});
test('should map pdf data of buy sample from 2015 (ISHS)', () => {
const activity = consorsbank.parsePages(buySamples[5]).activities;
expect(activity).toEqual([
{
broker: 'consorsbank',
type: 'Buy',
company: 'ISHS-EO CO.BD LA.C.UTS DZ',
date: '2015-08-03',
datetime: '2015-08-03T06:00:48.000Z',
isin: 'DE0002511243',
wkn: '251124',
price: 133.2393168997759,
shares: 0.51764,
amount: 68.97,
<<<<<<<
datetime: '2020-05-14T' + activities[0].datetime.substring(11),
fee: 0,
=======
>>>>>>>
datetime: '2020-05-14T' + activities[0].datetime.substring(11), |
<<<<<<<
export const parseOrderOrDividend = textArr => {
let type, date, time, isin, company, shares, price, amount, tax, fee;
=======
const parseOrderOrDividend = textArr => {
let type, date, isin, company, shares, price, amount, tax, fee;
>>>>>>>
const parseOrderOrDividend = textArr => {
let type, date, time, isin, company, shares, price, amount, tax, fee; |
<<<<<<<
test('Can the order parsed from saving_plan', () => {
const activities = comdirect.parsePages(sellSamples[0]).activities;
=======
test('Can parse the sell order: 2020_eur_stock_biontech', () => {
const result = comdirect.parsePages(sellSamples[0]);
>>>>>>>
test('Can parse the sell order: 2020_eur_stock_biontech', () => {
const activities = comdirect.parsePages(sellSamples[0]).activities; |
<<<<<<<
import * as commerzbank from './commerzbank';
import * as consorsbank from './consorsbank';
=======
import * as consorsbank from './consorsbank';
import * as cortalconsors from './cortalconsors';
>>>>>>>
import * as commerzbank from './commerzbank';
import * as consorsbank from './consorsbank';
import * as cortalconsors from './cortalconsors';
<<<<<<<
=======
import * as _1822direkt from './1822direkt';
import * as baaderBank from './baaderBank';
>>>>>>>
<<<<<<<
commerzbank,
consorsbank,
=======
consorsbank,
cortalconsors,
>>>>>>>
commerzbank,
consorsbank,
cortalconsors,
<<<<<<<
=======
flatex,
_1822direkt,
baaderBank,
>>>>>>> |
<<<<<<<
import {
parseGermanNum,
validateActivity,
createActivityDateTime,
timeRegex,
} from '@/helper';
=======
import { onvistaIdentificationString } from './onvista';
import { parseGermanNum, validateActivity } from '@/helper';
>>>>>>>
import { onvistaIdentificationString } from './onvista';
import {
parseGermanNum,
validateActivity,
createActivityDateTime,
timeRegex,
} from '@/helper';
<<<<<<<
} else if (type === 'Sell') {
return text[companyLineIndex + 1].trim();
} else if (type === 'Dividend') {
=======
} else if (type === 'Sell') {
const lineContent = text[companyLineIndex + 1].trim();
if (formatId === 0) {
// In this format, the name is one the same line as the WKN. We need only the first element before multiple spaces. Example:
// Arcimoto Inc. A2JN1H
return lineContent.split(/\s{2,}/)[0].trim();
}
return lineContent;
} else if (type === 'Dividend') {
>>>>>>>
} else if (type === 'Sell') {
const lineContent = text[companyLineIndex + 1].trim();
if (formatId === 0) {
// In this format, the name is one the same line as the WKN. We need only the first element before multiple spaces. Example:
// Arcimoto Inc. A2JN1H
return lineContent.split(/\s{2,}/)[0].trim();
}
return lineContent;
} else if (type === 'Dividend') {
<<<<<<<
return dateLine.match(/[0-9]{2}.[0-9]{2}.[1-2][0-9]{3}/)[0];
=======
return format(
parse(
dateLine.match(/[0-9]{2}.[0-9]{2}.[1-2][0-9]{3}/)[0],
'dd.MM.yyyy',
new Date()
),
'yyyy-MM-dd'
);
>>>>>>>
return dateLine.match(/[0-9]{2}.[0-9]{2}.[1-2][0-9]{3}/)[0];
<<<<<<<
if (splitSellAmountIndex >= 0) {
const splitSellLine = textArr[splitSellAmountIndex - 3].split(/\s+/);
return parseGermanNum(splitSellLine[splitSellLine.length - 1]);
=======
if (splitSellAmountIndex >= 0) {
if (formatId === 0) {
const splitSellLine = textArr[splitSellAmountIndex - 1].split(/\s+/);
return parseGermanNum(splitSellLine[2]);
} else {
const splitSellLine = textArr[splitSellAmountIndex - 3].split(/\s+/);
return parseGermanNum(splitSellLine[splitSellLine.length - 1]);
}
>>>>>>>
if (splitSellAmountIndex >= 0) {
if (formatId === 0) {
const splitSellLine = textArr[splitSellAmountIndex - 1].split(/\s+/);
return parseGermanNum(splitSellLine[2]);
} else {
const splitSellLine = textArr[splitSellAmountIndex - 3].split(/\s+/);
return parseGermanNum(splitSellLine[splitSellLine.length - 1]);
}
<<<<<<<
const findAmount = (textArr, fxRate, foreignCurrency) => {
=======
const findAmount = (textArr, fxRate, foreignCurrency, formatId) => {
>>>>>>>
const findAmount = (textArr, fxRate, foreignCurrency, formatId) => {
<<<<<<<
if (splitSellAmountIndex > 0) {
amount = Big(parseGermanNum(textArr[splitSellAmountIndex - 1]));
} else if (amountIndex > 0) {
=======
if (splitSellAmountIndex > 0) {
let lineWithAmount;
if (formatId === 0) {
const splittedLine = textArr[splitSellAmountIndex - 1].split(/\s+/);
lineWithAmount = splittedLine[splittedLine.length - 1];
if (splittedLine[splittedLine.length - 2] === foreignCurrency) {
isInForeignCurrency = true;
}
} else {
lineWithAmount = textArr[splitSellAmountIndex - 1];
}
amount = Big(parseGermanNum(lineWithAmount));
} else if (amountIndex > 0) {
>>>>>>>
if (splitSellAmountIndex > 0) {
let lineWithAmount;
if (formatId === 0) {
const splittedLine = textArr[splitSellAmountIndex - 1].split(/\s+/);
lineWithAmount = splittedLine[splittedLine.length - 1];
if (splittedLine[splittedLine.length - 2] === foreignCurrency) {
isInForeignCurrency = true;
}
} else {
lineWithAmount = textArr[splitSellAmountIndex - 1];
}
amount = Big(parseGermanNum(lineWithAmount));
} else if (amountIndex > 0) {
<<<<<<<
const findFee = (textArr, amount, isSell = false) => {
const span = isSell ? 8 : 1;
const preTaxLine = textArr[
textArr.findIndex(t => t.includes('vor Steuern')) + span
].split(/\s+/);
const preTaxAmount = parseGermanNum(preTaxLine[preTaxLine.length - 1]);
return isSell
? Big(amount).minus(preTaxAmount)
: Big(preTaxAmount).minus(amount);
=======
const findFee = (textArr, amount, isSell = false, formatId = undefined) => {
const span = formatId === undefined || formatId === 1 ? 8 : 1;
const preTaxLine = textArr[
textArr.findIndex(t => t.includes('vor Steuern')) + span
].split(/\s+/);
const preTaxAmount = parseGermanNum(preTaxLine[preTaxLine.length - 1]);
return isSell
? Big(amount).minus(preTaxAmount)
: Big(preTaxAmount).minus(amount);
>>>>>>>
const findFee = (textArr, amount, isSell = false, formatId = undefined) => {
const span = formatId === undefined || formatId === 1 ? 8 : 1;
const preTaxLine = textArr[
textArr.findIndex(t => t.includes('vor Steuern')) + span
].split(/\s+/);
const preTaxAmount = parseGermanNum(preTaxLine[preTaxLine.length - 1]);
return isSell
? Big(amount).minus(preTaxAmount)
: Big(preTaxAmount).minus(amount);
<<<<<<<
if (payedTaxIndex >= 0) {
payoutTax = payoutTax.plus(
Big(parseGermanNum(textArr[payedTaxIndex + 2])).abs()
);
=======
if (payedTaxIndex >= 0) {
let lineWithTaxValue;
if (formatId === 1) {
lineWithTaxValue = textArr[payedTaxIndex + 2];
} else {
lineWithTaxValue = textArr[payedTaxIndex + 1].split(/\s+/)[1];
}
payoutTax = payoutTax.plus(Big(parseGermanNum(lineWithTaxValue)).abs());
>>>>>>>
if (payedTaxIndex >= 0) {
let lineWithTaxValue;
if (formatId === 1) {
lineWithTaxValue = textArr[payedTaxIndex + 2];
} else {
lineWithTaxValue = textArr[payedTaxIndex + 1].split(/\s+/)[1];
}
payoutTax = payoutTax.plus(Big(parseGermanNum(lineWithTaxValue)).abs());
<<<<<<<
time = findOrderTime(textArr);
shares = findShares(textArr);
amount = +findAmount(textArr);
=======
[fxRate, foreignCurrency] = findBuyFxRateForeignCurrency(textArr);
shares = findShares(textArr, formatId);
amount = +findAmount(textArr, fxRate, foreignCurrency, formatId);
>>>>>>>
time = findOrderTime(textArr);
[fxRate, foreignCurrency] = findBuyFxRateForeignCurrency(textArr);
shares = findShares(textArr, formatId);
amount = +findAmount(textArr, fxRate, foreignCurrency, formatId);
<<<<<<<
const [parsedDate, parsedDateTime] = createActivityDateTime(date, time);
=======
>>>>>>>
const [parsedDate, parsedDateTime] = createActivityDateTime(date, time); |
<<<<<<<
export const parseSinglePage = textArr => {
return parsePage(textArr, findTableIndexes(textArr)[0]);
};
export const parsePage = (textArr, startLineNumer) => {
let type, date, time, isin, company, shares, price, amount, fee, tax;
=======
const parsePage = (textArr, startLineNumer) => {
let type, date, isin, company, shares, price, amount, fee, tax;
>>>>>>>
const parsePage = (textArr, startLineNumer) => {
let type, date, time, isin, company, shares, price, amount, fee, tax; |
<<<<<<<
return content[findBuySellLineNumber(content) + 2].substr(3, 10).trim();
};
const findOrderTime = content => {
// Extract the time after the line with order time which contains "15:57:49"
const lineContent = content[findBuySellLineNumber(content) + 4];
if (lineContent === undefined || !lineContent.includes(':')) {
return undefined;
}
return lineContent.trim();
=======
const idx = textArr.findIndex(
t =>
t.toLowerCase() === 'orderabrechnung' ||
t.toLowerCase() === 'wertpapierabrechnung'
);
return textArr[idx + 2].substr(3, 10).trim();
>>>>>>>
return content[findBuySellLineNumber(content) + 2].substr(3, 10).trim();
};
const findOrderTime = content => {
// Extract the time after the line with order time which contains "15:57:49"
const lineContent = content[findBuySellLineNumber(content) + 4];
if (lineContent === undefined || !lineContent.includes(':')) {
return undefined;
}
return lineContent.trim();
<<<<<<<
const lineNumber = findBuySellLineNumber(textArr);
return lineNumber >= 0 && textArr[lineNumber + 1].toLowerCase() === 'kauf';
=======
const idx = textArr.findIndex(
t =>
t.toLowerCase() === 'orderabrechnung' ||
t.toLowerCase() === 'wertpapierabrechnung'
);
return idx >= 0 && textArr[idx + 1].toLowerCase() === 'kauf';
>>>>>>>
const lineNumber = findBuySellLineNumber(textArr);
return lineNumber >= 0 && textArr[lineNumber + 1].toLowerCase() === 'kauf';
<<<<<<<
const lineNumber = findBuySellLineNumber(textArr);
return lineNumber >= 0 && textArr[lineNumber + 1].toLowerCase() === 'verkauf';
=======
const idx = textArr.findIndex(
t =>
t.toLowerCase() === 'orderabrechnung' ||
t.toLowerCase() === 'wertpapierabrechnung'
);
return idx >= 0 && textArr[idx + 1].toLowerCase() === 'verkauf';
>>>>>>>
const lineNumber = findBuySellLineNumber(textArr);
return lineNumber >= 0 && textArr[lineNumber + 1].toLowerCase() === 'verkauf';
<<<<<<<
let type, date, time, isin, company, shares, price, amount, fee, tax;
=======
let type, date, shares, amount, fee, tax, fxRate, foreignCurrency;
>>>>>>>
let type, date, time, shares, amount, fee, tax, fxRate, foreignCurrency;
<<<<<<<
const [parsedDate, parsedDateTime] = createActivityDateTime(
date,
time,
'dd.MM.yyyy',
'dd.MM.yyyy HH:mm:ss'
);
return validateActivity({
=======
let activity = {
>>>>>>>
const [parsedDate, parsedDateTime] = createActivityDateTime(
date,
time,
'dd.MM.yyyy',
'dd.MM.yyyy HH:mm:ss'
);
const activity = {
<<<<<<<
date: parsedDate,
datetime: parsedDateTime,
isin,
=======
date: format(parse(date, 'dd.MM.yyyy', new Date()), 'yyyy-MM-dd'),
>>>>>>>
date: parsedDate,
datetime: parsedDateTime, |
<<<<<<<
this._map.fitBounds(this._fullExtent);
=======
this._fitSection(0, this._data.length - 1);
>>>>>>>
this._map.fitBounds(this._fullExtent);
<<<<<<<
this._fullExtent = this._calculateFullExtent(this._data);
return;
=======
>>>>>>>
this._fullExtent = this._calculateFullExtent(this._data); |
<<<<<<<
const transformUpdateAssetInfo = (currencyService, tx) => {
return currencyService.get(tx.assetId).then(asset => {
return Object.assign(copyMandatoryAttributes(tx), {
asset,
fee: Money.fromCoins(tx.fee, Currency.WAVES),
timestamp: new DateTime(tx.timestamp),
assetName: tx.name,
description: tx.description,
assetId: tx.assetId,
})
});
}
const transformScriptInvocation = (currencyService, stateChangeService, tx, shouldLoadDetails) => {
return currencyService.get(tx.feeAssetId).then(feeCurrency => {
const promise = tx.payment && tx.payment.length > 0
? currencyService.get(tx.payment[0].assetId)
.then(currency => Money.fromCoins(tx.payment[0].amount, currency))
: Promise.resolve(null);
return promise.then(payment => {
const result = Object.assign(copyMandatoryAttributes(tx), {
dappAddress: tx.dApp,
call: tx.call || DEFAULT_FUNCTION_CALL,
payment,
fee: Money.fromCoins(tx.fee, feeCurrency)
});
if (!shouldLoadDetails)
return result;
return stateChangeService.loadStateChanges(tx.id).then(changes => {
result.stateChanges = changes.stateChanges;
return result;
}).catch(() => result);
=======
const transformScriptInvocation = (currencyService, stateChangeService, assetService, tx, shouldLoadDetails) => {
return currencyService.get(tx.feeAssetId).then(async (feeCurrency) => {
let payment = [];
if (tx.payment && tx.payment.length > 0) {
payment = (await Promise.all(tx.payment.map(async ({amount, assetId}) => {
const currency = await currencyService.get(assetId)
return Money.fromCoins(amount, currency)
})))
}
const result = Object.assign(copyMandatoryAttributes(tx), {
dappAddress: tx.dApp,
call: tx.call || DEFAULT_FUNCTION_CALL,
payment,
fee: Money.fromCoins(tx.fee, feeCurrency)
>>>>>>>
const transformUpdateAssetInfo = (currencyService, tx) => {
return currencyService.get(tx.assetId).then(asset => {
return Object.assign(copyMandatoryAttributes(tx), {
asset,
fee: Money.fromCoins(tx.fee, Currency.WAVES),
timestamp: new DateTime(tx.timestamp),
assetName: tx.name,
description: tx.description,
assetId: tx.assetId,
})
});
}
const transformScriptInvocation = (currencyService, stateChangeService, assetService, tx, shouldLoadDetails) => {
return currencyService.get(tx.feeAssetId).then(async (feeCurrency) => {
let payment = [];
if (tx.payment && tx.payment.length > 0) {
payment = (await Promise.all(tx.payment.map(async ({amount, assetId}) => {
const currency = await currencyService.get(assetId)
return Money.fromCoins(amount, currency)
})))
}
const result = Object.assign(copyMandatoryAttributes(tx), {
dappAddress: tx.dApp,
call: tx.call || DEFAULT_FUNCTION_CALL,
payment,
fee: Money.fromCoins(tx.fee, feeCurrency) |
<<<<<<<
const hasURI = !!uri;
=======
const isImageReady = uri && uri !== preview;
>>>>>>>
const hasURI = !!uri;
const isImageReady = uri && uri !== preview;
<<<<<<<
(hasDefaultSource && !hasPreview && !hasURI) && (
<RNImage
source={imageSourceHandling(defaultSource)}
style={computedStyle}
{...otherProps}
/>
)
}
{
hasPreview && (
=======
hasPreview && !isImageReady && (
>>>>>>>
(hasDefaultSource && !hasPreview && !hasURI) && (
<RNImage
source={imageSourceHandling(defaultSource)}
style={computedStyle}
{...otherProps}
/>
)
}
{
hasPreview && !isImageReady && ( |
<<<<<<<
this.state.block.id && items.default.push({label: 'BlockID', value: this.state.block.id})
=======
if(this.state.block.version === 5){
items.default.push( {label: 'VRF', value: this.state.block.VRF})
items.default.push( {label: 'transactionsRoot', value: this.state.block.transactionsRoot})
}
>>>>>>>
this.state.block.id && items.default.push({label: 'BlockID', value: this.state.block.id})
if(this.state.block.version === 5){
items.default.push( {label: 'VRF', value: this.state.block.VRF})
items.default.push( {label: 'transactionsRoot', value: this.state.block.transactionsRoot})
} |
<<<<<<<
})
test('nested x-for access outer loop variable', async () => {
document.body.innerHTML = `
<div x-data="{ foos: [ {name: 'foo', bars: ['bob', 'lob']}, {name: 'baz', bars: ['bab', 'lab']} ] }">
<template x-for="foo in foos">
<h1>
<template x-for="bar in foo.bars">
<h2 x-text="foo.name+': '+bar"></h2>
</template>
</h1>
</template>
</div>
`
Alpine.start()
await wait(() => { expect(document.querySelectorAll('h1').length).toEqual(2) })
await wait(() => { expect(document.querySelectorAll('h2').length).toEqual(4) })
expect(document.querySelectorAll('h2')[0].innerText).toEqual('foo: bob')
expect(document.querySelectorAll('h2')[1].innerText).toEqual('foo: lob')
expect(document.querySelectorAll('h2')[2].innerText).toEqual('baz: bab')
expect(document.querySelectorAll('h2')[3].innerText).toEqual('baz: lab')
})
test('nested x-for event listeners', async () => {
document._alerts = []
document.body.innerHTML = `
<div x-data="{ foos: [
{name: 'foo', bars: [{name: 'bob', count: 0}, {name: 'lob', count: 0}]},
{name: 'baz', bars: [{name: 'bab', count: 0}, {name: 'lab', count: 0}]}
], fnText: function(foo, bar) { return foo.name+': '+bar.name+' = '+bar.count; } }">
<template x-for="foo in foos">
<h1>
<template x-for="bar in foo.bars">
<h2 x-text="fnText(foo, bar)"
x-on:click="bar.count += 1; document._alerts.push(fnText(foo, bar))"
></h2>
</template>
</h1>
</template>
</div>
`
Alpine.start()
await wait(() => { expect(document.querySelectorAll('h1').length).toEqual(2) })
await wait(() => { expect(document.querySelectorAll('h2').length).toEqual(4) })
expect(document.querySelectorAll('h2')[0].innerText).toEqual('foo: bob = 0')
expect(document.querySelectorAll('h2')[1].innerText).toEqual('foo: lob = 0')
expect(document.querySelectorAll('h2')[2].innerText).toEqual('baz: bab = 0')
expect(document.querySelectorAll('h2')[3].innerText).toEqual('baz: lab = 0')
expect(document._alerts.length).toEqual(0)
document.querySelectorAll('h2')[0].click()
await wait(() => {
expect(document.querySelectorAll('h2')[0].innerText).toEqual('foo: bob = 1')
expect(document.querySelectorAll('h2')[1].innerText).toEqual('foo: lob = 0')
expect(document.querySelectorAll('h2')[2].innerText).toEqual('baz: bab = 0')
expect(document.querySelectorAll('h2')[3].innerText).toEqual('baz: lab = 0')
expect(document._alerts.length).toEqual(1)
expect(document._alerts[0]).toEqual('foo: bob = 1')
})
document.querySelectorAll('h2')[2].click()
await wait(() => {
expect(document.querySelectorAll('h2')[0].innerText).toEqual('foo: bob = 1')
expect(document.querySelectorAll('h2')[1].innerText).toEqual('foo: lob = 0')
expect(document.querySelectorAll('h2')[2].innerText).toEqual('baz: bab = 1')
expect(document.querySelectorAll('h2')[3].innerText).toEqual('baz: lab = 0')
expect(document._alerts.length).toEqual(2)
expect(document._alerts[0]).toEqual('foo: bob = 1')
expect(document._alerts[1]).toEqual('baz: bab = 1')
})
document.querySelectorAll('h2')[0].click()
await wait(() => {
expect(document.querySelectorAll('h2')[0].innerText).toEqual('foo: bob = 2')
expect(document.querySelectorAll('h2')[1].innerText).toEqual('foo: lob = 0')
expect(document.querySelectorAll('h2')[2].innerText).toEqual('baz: bab = 1')
expect(document.querySelectorAll('h2')[3].innerText).toEqual('baz: lab = 0')
expect(document._alerts.length).toEqual(3)
expect(document._alerts[0]).toEqual('foo: bob = 1')
expect(document._alerts[1]).toEqual('baz: bab = 1')
expect(document._alerts[2]).toEqual('foo: bob = 2')
})
=======
})
test('x-for updates the right elements when new item are inserted at the beginning of the list', async () => {
document.body.innerHTML = `
<div x-data="{ items: [{name: 'one', key: '1'}, {name: 'two', key: '2'}] }">
<button x-on:click="items = [{name: 'zero', key: '0'}, {name: 'one', key: '1'}, {name: 'two', key: '2'}]"></button>
<template x-for="item in items" :key="item.key">
<span x-text="item.name"></span>
</template>
</div>
`
Alpine.start()
expect(document.querySelectorAll('span').length).toEqual(2)
const itemA = document.querySelectorAll('span')[0]
itemA.setAttribute('order', 'first')
const itemB = document.querySelectorAll('span')[1]
itemB.setAttribute('order', 'second')
document.querySelector('button').click()
await wait(() => { expect(document.querySelectorAll('span').length).toEqual(3) })
expect(document.querySelectorAll('span')[0].innerText).toEqual('zero')
expect(document.querySelectorAll('span')[1].innerText).toEqual('one')
expect(document.querySelectorAll('span')[2].innerText).toEqual('two')
// Make sure states are preserved
expect(document.querySelectorAll('span')[0].getAttribute('order')).toEqual(null)
expect(document.querySelectorAll('span')[1].getAttribute('order')).toEqual('first')
expect(document.querySelectorAll('span')[2].getAttribute('order')).toEqual('second')
>>>>>>>
})
test('x-for updates the right elements when new item are inserted at the beginning of the list', async () => {
document.body.innerHTML = `
<div x-data="{ items: [{name: 'one', key: '1'}, {name: 'two', key: '2'}] }">
<button x-on:click="items = [{name: 'zero', key: '0'}, {name: 'one', key: '1'}, {name: 'two', key: '2'}]"></button>
<template x-for="item in items" :key="item.key">
<span x-text="item.name"></span>
</template>
</div>
`
Alpine.start()
expect(document.querySelectorAll('span').length).toEqual(2)
const itemA = document.querySelectorAll('span')[0]
itemA.setAttribute('order', 'first')
const itemB = document.querySelectorAll('span')[1]
itemB.setAttribute('order', 'second')
document.querySelector('button').click()
await wait(() => { expect(document.querySelectorAll('span').length).toEqual(3) })
expect(document.querySelectorAll('span')[0].innerText).toEqual('zero')
expect(document.querySelectorAll('span')[1].innerText).toEqual('one')
expect(document.querySelectorAll('span')[2].innerText).toEqual('two')
// Make sure states are preserved
expect(document.querySelectorAll('span')[0].getAttribute('order')).toEqual(null)
expect(document.querySelectorAll('span')[1].getAttribute('order')).toEqual('first')
expect(document.querySelectorAll('span')[2].getAttribute('order')).toEqual('second')
})
test('nested x-for access outer loop variable', async () => {
document.body.innerHTML = `
<div x-data="{ foos: [ {name: 'foo', bars: ['bob', 'lob']}, {name: 'baz', bars: ['bab', 'lab']} ] }">
<template x-for="foo in foos">
<h1>
<template x-for="bar in foo.bars">
<h2 x-text="foo.name+': '+bar"></h2>
</template>
</h1>
</template>
</div>
`
Alpine.start()
await wait(() => { expect(document.querySelectorAll('h1').length).toEqual(2) })
await wait(() => { expect(document.querySelectorAll('h2').length).toEqual(4) })
expect(document.querySelectorAll('h2')[0].innerText).toEqual('foo: bob')
expect(document.querySelectorAll('h2')[1].innerText).toEqual('foo: lob')
expect(document.querySelectorAll('h2')[2].innerText).toEqual('baz: bab')
expect(document.querySelectorAll('h2')[3].innerText).toEqual('baz: lab')
})
test('nested x-for event listeners', async () => {
document._alerts = []
document.body.innerHTML = `
<div x-data="{ foos: [
{name: 'foo', bars: [{name: 'bob', count: 0}, {name: 'lob', count: 0}]},
{name: 'baz', bars: [{name: 'bab', count: 0}, {name: 'lab', count: 0}]}
], fnText: function(foo, bar) { return foo.name+': '+bar.name+' = '+bar.count; } }">
<template x-for="foo in foos">
<h1>
<template x-for="bar in foo.bars">
<h2 x-text="fnText(foo, bar)"
x-on:click="bar.count += 1; document._alerts.push(fnText(foo, bar))"
></h2>
</template>
</h1>
</template>
</div>
`
Alpine.start()
await wait(() => { expect(document.querySelectorAll('h1').length).toEqual(2) })
await wait(() => { expect(document.querySelectorAll('h2').length).toEqual(4) })
expect(document.querySelectorAll('h2')[0].innerText).toEqual('foo: bob = 0')
expect(document.querySelectorAll('h2')[1].innerText).toEqual('foo: lob = 0')
expect(document.querySelectorAll('h2')[2].innerText).toEqual('baz: bab = 0')
expect(document.querySelectorAll('h2')[3].innerText).toEqual('baz: lab = 0')
expect(document._alerts.length).toEqual(0)
document.querySelectorAll('h2')[0].click()
await wait(() => {
expect(document.querySelectorAll('h2')[0].innerText).toEqual('foo: bob = 1')
expect(document.querySelectorAll('h2')[1].innerText).toEqual('foo: lob = 0')
expect(document.querySelectorAll('h2')[2].innerText).toEqual('baz: bab = 0')
expect(document.querySelectorAll('h2')[3].innerText).toEqual('baz: lab = 0')
expect(document._alerts.length).toEqual(1)
expect(document._alerts[0]).toEqual('foo: bob = 1')
})
document.querySelectorAll('h2')[2].click()
await wait(() => {
expect(document.querySelectorAll('h2')[0].innerText).toEqual('foo: bob = 1')
expect(document.querySelectorAll('h2')[1].innerText).toEqual('foo: lob = 0')
expect(document.querySelectorAll('h2')[2].innerText).toEqual('baz: bab = 1')
expect(document.querySelectorAll('h2')[3].innerText).toEqual('baz: lab = 0')
expect(document._alerts.length).toEqual(2)
expect(document._alerts[0]).toEqual('foo: bob = 1')
expect(document._alerts[1]).toEqual('baz: bab = 1')
})
document.querySelectorAll('h2')[0].click()
await wait(() => {
expect(document.querySelectorAll('h2')[0].innerText).toEqual('foo: bob = 2')
expect(document.querySelectorAll('h2')[1].innerText).toEqual('foo: lob = 0')
expect(document.querySelectorAll('h2')[2].innerText).toEqual('baz: bab = 1')
expect(document.querySelectorAll('h2')[3].innerText).toEqual('baz: lab = 0')
expect(document._alerts.length).toEqual(3)
expect(document._alerts[0]).toEqual('foo: bob = 1')
expect(document._alerts[1]).toEqual('baz: bab = 1')
expect(document._alerts[2]).toEqual('foo: bob = 2')
}) |
<<<<<<<
if (modifiers.includes('camel')) {
event = camelCase(event);
}
=======
const options = {
passive: modifiers.includes('passive')
};
>>>>>>>
const options = {
passive: modifiers.includes('passive')
};
if (modifiers.includes('camel')) {
event = camelCase(event);
} |
<<<<<<<
const { noop } = require('./utils');
const { getStats, reportRecordConsumed, startStatsEmitter } = require('./stats');
=======
>>>>>>> |
<<<<<<<
var cat = {};
cat.jsplumb_ready = false;
=======
// TODO remove when done debugging
function toggle_debug_log() {
$('#debug-log').toggleClass('hide');
}
>>>>>>>
var cat = {};
cat.jsplumb_ready = false;
// TODO remove when done debugging
function toggle_debug_log() {
$('#debug-log').toggleClass('hide');
}
<<<<<<<
cat.is_safe_to_render_connections = function() {
// connections can only draw themselves AFTER their pins have drawn
// and AFTER jsPlumb has had a chance to initialize itself
console.log('is_safe_to_render_connections constructor function');
// TODO I think I could use a promise here and it would be nicer.
var $document = $(document);
var visible_pins, rendered_pins;
var all_pins_rendered = false;
function check() {
if (all_pins_rendered && cat.jsplumb_ready) {
return true;
} else {
return false;
}
}
function maybe_trigger() {
if (check()) {
$('.connection').trigger('render-connection');
}
}
$document.on('reset-pins', function(e, pins) {
console.log('is_safe_to_render_connections caught reset-pins event with data', pins);
console.log('is_safe_to_render_connections init with pins', pins);
visible_pins = _.filter(pins, function(pin) {
return pin.is_visible;
});
rendered_pins = {};
all_pins_rendered = false;
});
$document.on('rendered-pin', function(e, pin) {
console.log('is_safe_to_render_connections caught rendered-pin event with data', pin);
if (pin === undefined) {
return;
}
rendered_pins[pin] = true;
if (_.keys(rendered_pins).length === visible_pins.length) {
all_pins_rendered = true;
maybe_trigger();
}
});
$document.on('jsplumb-ready', function(e) {
maybe_trigger();
});
return check;
}();
cat.app.controller('PinsCtrl', ['$scope', 'server', function($scope, server) {
=======
cat.app.controller('PinsCtrl', ['$scope', function($scope, server) {
>>>>>>>
cat.is_safe_to_render_connections = function() {
// connections can only draw themselves AFTER their pins have drawn
// and AFTER jsPlumb has had a chance to initialize itself
// TODO I think I could use a promise here and it would be nicer.
var $document = $(document);
var visible_pins, rendered_pins;
var all_pins_rendered = false;
function check() {
if (all_pins_rendered && cat.jsplumb_ready) {
return true;
} else {
return false;
}
}
function maybe_trigger() {
if (check()) {
$('.connection').trigger('render-connection');
}
}
$document.on('reset-pins', function(e, pins) {
visible_pins = _.pluck(_.filter(pins, function(pin) {
return pin.is_visible;
}), 'id');
console.log('visible pins', visible_pins);
rendered_pins = {};
all_pins_rendered = false;
});
$document.on('rendered-pin', function(e, pin) {
// TODO why does this callback happen whenever a connection is rendered, with the ID of the connection?
if (visible_pins.indexOf(pin) < 0) {
console.log('this pin is weird:', pin);
return;
}
rendered_pins[pin] = true;
if (_.keys(rendered_pins).length === visible_pins.length) {
all_pins_rendered = true;
maybe_trigger();
}
});
$document.on('jsplumb-ready', function(e) {
maybe_trigger();
});
return check;
}();
cat.app.controller('PinsCtrl', ['$scope', function($scope, server) {
var $document = $(document);
<<<<<<<
};
=======
console.log('after disconnect we have', $scope.connections.length, 'connections');
}
>>>>>>>
};
<<<<<<<
function remove_self(e) {
if (confirm(msg)) {
connection.unbind('mousedown');
$scope.$apply(function() {
$scope.disconnect($sensor, $actuator);
});
jsPlumb.detach(connection);
}
=======
function remove_self(e) {
if (confirm(msg)) {
connection.unbind('mousedown');
$scope.$apply(function() {
$scope.disconnect(attrs.sensor, attrs.actuator);
});
>>>>>>>
function remove_self(e) {
if (confirm(msg)) {
connection.unbind('mousedown');
$scope.$apply(function() {
$scope.disconnect(attrs.sensor, attrs.actuator);
});
}
<<<<<<<
if (connection !== null) {
connection.unbind('mousedown');
}
=======
connection.unbind('mousedown');
jsPlumb.detach(connection);
>>>>>>>
if (connection !== null) {
connection.unbind('mousedown');
jsPlumb.detach(connection);
}
<<<<<<<
function read() {
// TODO HTTP GET
pins = {};
_.each(pin_defaults, function(obj, IorO) { // input or output
_.each(obj, function(nums, AorD) { // analog or digital
_.each(nums, function(num) { // all pin numbers of this type
var is_input = IorO === 'input';
var is_analog = AorD === 'analog';
var name = pin_name(num, is_analog, is_input);
pins[name] = {
'name': name,
'label': 'Label for ' + name,
'is_analog': is_analog,
'is_input': is_input,
'value': 0,
'is_visible': true,
'connected_to': [],
};
});
});
});
connections = [{source: 'A0', target: '1'},
{source: 'A1', target: '1'}];
_.each(connections, function(c) {
pins[c.source].connected_to.push(c.target);
pins[c.target].connected_to.push(c.source);
});
}
function write() {
// TODO format data from $scope.pins and $scope.connections
// TODO HTTP POST
=======
function pin_id(number, is_analog, is_input) {
if (is_input && is_analog) {
return 'A' + number;
} else {
return number.toString();
}
>>>>>>>
function pin_id(number, is_analog, is_input) {
if (is_input && is_analog) {
return 'A' + number;
} else {
return number.toString();
} |
<<<<<<<
this.workspace_.resizeContents();
=======
Blockly.resizeSvgContents(this.workspace_);
return openNode;
>>>>>>>
this.workspace_.resizeContents();
return openNode; |
<<<<<<<
if (xml.tagName) {
var tagName = xml.tagName.toUpperCase();
if (tagName == 'BLOCK') {
var curBlock = Blockly.Xml.domToBlock(xml, this.workspace_);
if (curBlock.disabled) {
// Record blocks that were initially disabled.
// Do not enable these blocks as a result of capacity filtering.
this.permanentlyDisabled_.push(curBlock);
}
contents.push({type: 'block', block: curBlock});
var gap = parseInt(xml.getAttribute('gap'), 10);
gaps.push(isNaN(gap) ? this.MARGIN * 3 : gap);
}
else if (tagName == 'BUTTON') {
var label = xml.getAttribute('text');
var curButton = new Blockly.FlyoutButton(this.workspace_,
this.targetWorkspace_, label);
contents.push({type: 'button', button: curButton});
gaps.push(this.MARGIN);
=======
if (xml.tagName) {
if (xml.tagName.toUpperCase() == 'BLOCK') {
var curBlock = Blockly.Xml.domToBlock(xml, this.workspace_);
if (curBlock.disabled) {
// Record blocks that were initially disabled.
// Do not enable these blocks as a result of capacity filtering.
this.permanentlyDisabled_.push(curBlock);
}
blocks.push(curBlock);
var gap = parseInt(xml.getAttribute('gap'), 10);
gaps.push(isNaN(gap) ? this.MARGIN * 3 : gap);
} else if (xml.tagName.toUpperCase() == 'SEP') {
// Change the gap between two blocks.
// <sep gap="36"></sep>
// The default gap is 24, can be set larger or smaller.
// This overwrites the gap attribute on the previous block.
// Note that a deprecated method is to add a gap to a block.
// <block type="math_arithmetic" gap="8"></block>
var newGap = parseInt(xml.getAttribute('gap'), 10);
// Ignore gaps before the first block.
if (!isNaN(newGap) && gaps.length > 0) {
gaps[gaps.length - 1] = newGap;
} else {
gaps.push(this.MARGIN * 3);
}
>>>>>>>
if (xml.tagName) {
var tagName = xml.tagName.toUpperCase();
if (tagName == 'BLOCK') {
var curBlock = Blockly.Xml.domToBlock(xml, this.workspace_);
if (curBlock.disabled) {
// Record blocks that were initially disabled.
// Do not enable these blocks as a result of capacity filtering.
this.permanentlyDisabled_.push(curBlock);
}
contents.push({type: 'block', block: curBlock});
var gap = parseInt(xml.getAttribute('gap'), 10);
gaps.push(isNaN(gap) ? this.MARGIN * 3 : gap);
} else if (xml.tagName.toUpperCase() == 'SEP') {
// Change the gap between two blocks.
// <sep gap="36"></sep>
// The default gap is 24, can be set larger or smaller.
// This overwrites the gap attribute on the previous block.
// Note that a deprecated method is to add a gap to a block.
// <block type="math_arithmetic" gap="8"></block>
var newGap = parseInt(xml.getAttribute('gap'), 10);
// Ignore gaps before the first block.
if (!isNaN(newGap) && gaps.length > 0) {
gaps[gaps.length - 1] = newGap;
} else {
gaps.push(this.MARGIN * 3);
}
} else if (tagName == 'BUTTON') {
var label = xml.getAttribute('text');
var curButton = new Blockly.FlyoutButton(this.workspace_,
this.targetWorkspace_, label);
contents.push({type: 'button', button: curButton});
gaps.push(this.MARGIN); |
<<<<<<<
export { createRouteMiddleware } from './create-route-middleware';
=======
export { withFeatureToggles } from './with-feature-toggles';
export {
createRouteMiddleware,
getEnabledFeatures,
updateFeaturesWithQuery
};
>>>>>>>
export { createRouteMiddleware } from './create-route-middleware';
export { withFeatureToggles } from './with-feature-toggles'; |
<<<<<<<
export { mergeFeatures } from './merge-features';
=======
export { FeatureToggles } from './feature-toggles';
export { Feature } from './feature';
>>>>>>>
export { mergeFeatures } from './merge-features';
export { FeatureToggles } from './feature-toggles';
export { Feature } from './feature'; |
<<<<<<<
import { curry } from 'ramda';
import { getIsEnabled } from './get-is-enabled';
import { updateFeaturesWithQuery } from './update-features-with-query';
=======
import curry from 'ramda/src/curry';
import getIsEnabled from './get-is-enabled';
import updateFeatures from './update-features-with-query';
>>>>>>>
import curry from 'ramda/src/curry'; |
<<<<<<<
maxChildCount: userConfig.maxChildCount || 0, // The maximum amount of children to show per row before wrapping.
onClick: userConfig.onClick || RelationshipGraph.noop, // The callback function to call when a child is clicked. This function gets passed the JSON for the child.
=======
maxChildCount: userConfig.maxChildCount || 0, // The maximum amount of children to show before wrapping.
onClick: userConfig.onClick || defaultOnClick, // The callback function to call when a node is clicked.
>>>>>>>
maxChildCount: userConfig.maxChildCount || 0, // The maximum amount of children to show per row.
onClick: userConfig.onClick || defaultOnClick, // The callback function to call.
<<<<<<<
colors: userConfig.colors || RelationshipGraph.getColors(), // Colors to use for blocks.
transitionTime: userConfig.transitionTime || 1500, // Time for a transition to start and complete (in milliseconds).
truncate: userConfig.truncate || 25 // Maximum length of a parent label before it gets truncated. Use 0 to turn off truncation.
=======
colors: userConfig.colors || ['#c4f1be', '#a2c3a4', '#869d96', '#525b76', '#201e50',
'#485447', '#5b7f77', '#6474ad', '#b9c6cb', '#c0d6c1',
'#754668', '#587d71', '#4daa57', '#b5dda4', '#f9eccc',
'#0e7c7b', '#17bebb', '#d4f4dd', '#d62246', '#4b1d3f',
'#cf4799', '#c42583', '#731451', '#f3d1bf', '#c77745'
], // Colors to use for blocks.
transitionTime: userConfig.transitionTime || 1500, // Time for a transition to start and complete.
truncate: userConfig.truncate || 0, // Maximum length of a parent label before it gets truncated.
sortFunction: userConfig.sortFunction || sortJson, // A custom sort function.
valueKeyName: userConfig.valueKeyName // Set a custom key value in the tooltip.
>>>>>>>
colors: userConfig.colors || RelationshipGraph.getColors(), // Colors to use for blocks.
transitionTime: userConfig.transitionTime || 1500, // Time for a transition to start and complete.
truncate: userConfig.truncate || 0, // Maximum length of a parent label. Use 0 to turn off truncation.
sortFunction: userConfig.sortFunction || RelationshipGraph.sortJson, // A custom sort function
valueKeyName: userConfig.valueKeyName // Set a custom key in the tooltip.
<<<<<<<
self.tooltip.direction('n');
=======
>>>>>>>
<<<<<<<
this.tooltip = this.configuration.showTooltips ? createTooltip(this) : null;
=======
if (this.config.showTooltips) {
this.tip = createTooltip(this);
this.tip.direction('n');
} else {
this.tip = null;
}
>>>>>>>
if (this.configuration.showTooltips) {
this.tooltip = createTooltip(this);
this.tooltip.direction('n');
} else {
this.tooltip = null;
}
<<<<<<<
* @param json {Array} The array of Objects to loop through.
* @param parentSizes {Object} The parent sizes determined.
* @param parents {Array} The parent label names.
* @returns {Array} Object containing the longest width, the calculated max children per row, and the maximum amount
* of rows.
=======
* @param {RelationshipGraph} that The relationship graph object.
* @param {Array} json The array of Objects to loop through.
* @param {Object} parentSizes The parent sizes determined.
* @param {Array} parents The parent label names.
* @returns {Object} Object containing the longest width, the calculated max children per row, and the maximum
* amount of rows.
* @private
>>>>>>>
* @param json {Array} The array of Objects to loop through.
* @param parentSizes {Object} The parent sizes determined.
* @param parents {Array} The parent label names.
* @returns {Array} Object containing the longest width, the calculated max children per row, and the maximum amount
* of rows.
<<<<<<<
for (i = 0; i < parents.length; i++) {
let current = parents[i] + ' ( ' + parentSizes[parentNames[i]] + ') ';
=======
for (i = 0; i < parentLength; i++) {
var current = parents[i] + ' ( ' + parentSizes[parentNames[i]] + ') ';
>>>>>>>
for (i = 0; i < parentLength; i++) {
var current = parents[i] + ' ( ' + parentSizes[parentNames[i]] + ') ';
<<<<<<<
let longestWidth = this.ctx.measureText(longest).width,
parentDiv = this.configuration.selection._groups[0][0].parentElement,
calculatedMaxChildren = (this.configuration.maxChildCount === 0) ?
Math.floor((parentDiv.parentElement.clientWidth - 15 - longestWidth) / this.configuration.blockSize) :
this.configuration.maxChildCount;
for (i = 0; i < json.length; i++) {
let element = json[i],
=======
var longestWidth = that.getPixelLength(longest),
parentDiv = config.selection[0][0],
calculatedMaxChildren = (config.maxChildCount === 0) ?
Math.floor((parentDiv.parentElement.clientWidth - blockSize - longestWidth) / blockSize) :
config.maxChildCount,
jsonLength = json.length,
thresholds = config.thresholds;
for (i = 0; i < jsonLength; i++) {
var element = json[i],
>>>>>>>
var longestWidth = this.getPixelLength(longest),
parentDiv = config.selection._groups[0][0],
calculatedMaxChildren = (config.maxChildCount === 0) ?
Math.floor((parentDiv.parentElement.clientWidth - blockSize - longestWidth) / blockSize) :
config.maxChildCount,
jsonLength = json.length,
thresholds = config.thresholds;
for (i = 0; i < jsonLength; i++) {
var element = json[i],
<<<<<<<
if (this.configuration.thresholds.length === 0) {
=======
if (thresholds.length === 0) {
>>>>>>>
if (thresholds.length === 0) {
<<<<<<<
if (typeof this.configuration.thresholds[0] === 'string') {
=======
if (typeof thresholds[0] === 'string') {
>>>>>>>
if (typeof thresholds[0] === 'string') {
<<<<<<<
_this = this,
=======
>>>>>>>
config = this.configuration;
let row = 0,
<<<<<<<
calculatedMaxChildren = 0,
longestWidth = 0;
=======
calculatedMaxChildren,
longestWidth,
config = this.config;
>>>>>>>
calculatedMaxChildren = 0,
longestWidth = 0;
<<<<<<<
RelationshipGraph.sortJson(json);
=======
config.sortFunction(json);
>>>>>>>
config.sortFunction(json);
<<<<<<<
parents.push(RelationshipGraph.truncate(parent, this.configuration.truncate));
=======
parents.push(truncate(parent, config.truncate));
>>>>>>>
parents.push(RelationshipGraph.truncate(parent, config.truncate));
<<<<<<<
// Assign the indexes and rows to each child. This method also calculates the maximum amount of children per row, the longest
// row width, and how many rows there are.
[longestWidth, calculatedMaxChildren, row] = this.assignIndexAndRow(json, parentSizes, parents);
=======
/**
* Assign the indexes and rows to each child. This method also calculates the maximum amount of children
* per row, the longest row width, and how many rows there are.
*/
var calculatedResults = assignIndexAndRow(this, json, parentSizes, parents);
calculatedMaxChildren = calculatedResults.calculatedMaxChildren;
longestWidth = calculatedResults.longestWidth;
row = calculatedResults.maxRow;
>>>>>>>
/**
* Assign the indexes and rows to each child. This method also calculates the maximum amount of children
* per row, the longest row width, and how many rows there are.
*/
[longestWidth, calculatedMaxChildren, row] = this.assignIndexAndRow(json, parentSizes, parents);
<<<<<<<
maxHeight = row * this.configuration.blockSize;
maxWidth = longestWidth + (calculatedMaxChildren * this.configuration.blockSize);
=======
maxHeight = row * config.blockSize;
maxWidth = longestWidth + calculatedMaxChildren * config.blockSize;
>>>>>>>
maxHeight = row * config.blockSize;
maxWidth = longestWidth + calculatedMaxChildren * config.blockSize;
<<<<<<<
parentNodes.enter().append('text')
.text(function(obj, index) {
return obj + ' (' + parentSizes[Object.keys(parentSizes)[index]] + ')';
})
.attr('x', function(obj, index) {
let width = _this.ctx.measureText(obj + ' (' + parentSizes[Object.keys(parentSizes)[index]] + ')');
return longestWidth - width.width;
})
.attr('y', function(obj, index) {
if (index === 0) {
return 0;
}
// Determine the Y coordinate by determining the Y coordinate of all of the parents before. This has to be calculated completely
// because it is an update and can occur anywhere.
let previousParentSize = 0,
i = index - 1;
while (i > -1) {
previousParentSize += Math.ceil(parentSizes[Object.keys(parentSizes)[i]] / calculatedMaxChildren) * calculatedMaxChildren;
i--;
}
return Math.ceil(previousParentSize / calculatedMaxChildren) * _this.configuration.blockSize;
})
.style('text-anchor', 'start')
.style('fill', function(obj) {
return (obj.parentColor !== undefined) ? _this.configuration.colors[obj.parentColor] : '#000000';
})
.attr('class', 'relationshipGraph-Text')
.attr('transform', 'translate(-6, ' + this.configuration.blockSize / 1.5 + ')');
=======
createParents(this, parentNodes, parentSizes, longestWidth, calculatedMaxChildren);
>>>>>>>
this.createParents(parentNodes, parentSizes, longestWidth, calculatedMaxChildren);
<<<<<<<
parentNodes
.text(function(obj, index) {
return obj + ' (' + parentSizes[Object.keys(parentSizes)[index]] + ')';
})
.attr('x', function(obj, index) {
let width = _this.ctx.measureText(obj + ' (' + parentSizes[Object.keys(parentSizes)[index]] + ')');
return longestWidth - width.width;
})
.attr('y', function(obj, index) {
if (index === 0) {
return 0;
}
// Determine the Y coordinate by determining the Y coordinate of all of the parents before. This has to be calculated completely
// because it is an update and can occur anywhere.
let previousParentSize = 0,
i = index - 1;
while (i > -1) {
previousParentSize += Math.ceil(parentSizes[Object.keys(parentSizes)[i]] / calculatedMaxChildren) * calculatedMaxChildren;
i--;
}
return Math.ceil(previousParentSize / calculatedMaxChildren) * _this.configuration.blockSize;
})
.style('fill', function(obj) {
return (obj.parentColor !== undefined) ? _this.configuration.colors[obj.parentColor] : '#000000';
});
=======
updateParents(this, parentNodes, parentSizes, longestWidth, calculatedMaxChildren);
>>>>>>>
this.updateParents(parentNodes, parentSizes, longestWidth, calculatedMaxChildren);
<<<<<<<
childrenNodes.enter()
.append('rect')
.attr('x', function(obj) {
return longestWidth + ((obj.index - 1) * _this.configuration.blockSize);
})
.attr('y', function(obj) {
return (obj.row - 1) * _this.configuration.blockSize;
})
.attr('rx', 4)
.attr('ry', 4)
.attr('class', 'relationshipGraph-block')
.attr('width', _this.configuration.blockSize)
.attr('height', _this.configuration.blockSize)
.style('fill', function(obj) {
return _this.configuration.colors[obj.color % _this.configuration.colors.length] || _this.configuration.colors[0];
})
.on('mouseover', _this.tooltip ? _this.tooltip.show : RelationshipGraph.noop)
.on('mouseout', _this.tooltip ? _this.tooltip.hide : RelationshipGraph.noop)
.on('click', function(obj) {
_this.tooltip.hide();
_this.configuration.onClick(obj);
});
=======
createChildren(this, childrenNodes, longestWidth);
>>>>>>>
this.createChildren(childrenNodes, longestWidth);
<<<<<<<
childrenNodes.transition(_this.configuration.transitionTime)
.attr('x', function(obj) {
return longestWidth + ((obj.index - 1) * _this.configuration.blockSize);
})
.attr('y', function(obj) {
return (obj.row - 1) * _this.configuration.blockSize;
})
.style('fill', function(obj) {
return _this.configuration.colors[obj.color % _this.configuration.colors.length] || _this.configuration.colors[0];
});
=======
updateChildren(this, childrenNodes, longestWidth);
>>>>>>>
this.updateChildren(childrenNodes, longestWidth);
<<<<<<<
childrenNodes.exit().transition(_this.configuration.transitionTime).remove();
=======
removeNodes(this, childrenNodes);
>>>>>>>
this.removeNodes(childrenNodes);
<<<<<<<
this.configuration.selection.select('svg')
.attr('width', maxWidth + 15)
.attr('height', maxHeight + 15);
=======
this.config.selection.select('svg')
.attr('width', Math.abs(maxWidth + 15))
.attr('height', Math.abs(maxHeight + 15));
>>>>>>>
this.configuration.selection.select('svg')
.attr('width', Math.abs(maxWidth + 15))
.attr('height', Math.abs(maxHeight + 15)); |
<<<<<<<
this.stopped = false;
=======
this._stopped = false;
// Manual
this.manual = options.manual;
this.value = 0;
>>>>>>>
this.stopped = false;
// Manual
this.manual = options.manual;
this.value = 0;
<<<<<<<
if(this.stopped)
=======
if(this.manual) {
this.currentTime = time;
this.easing.tick(this.value);
this.updateCurrentTransform();
return;
}
var startTime = this.startTime;
var currentTime = this.currentTime;
var delay = this.delay;
var duration = this.duration;
if(this._stopped)
>>>>>>>
if(this.stopped)
return;
if(this.manual) {
this.currentTime = time;
this.easing.tick(this.value);
this.updateCurrentTransform();
return;
}
// If first tick, set start_time
if(!this.startTime) {
this.startTime = time;
}
if(time - this.startTime > this.delay)
this.currentTime = time - this.delay;
var curr = Math.min(Math.max(0.0, this.currentTime - this.startTime), this.duration);
this.easing.tick(curr/this.duration);
this.updateCurrentTransform();
};
snabbtjs.Animation.prototype.getCurrentState = function() {
return this.currentState;
};
snabbtjs.Animation.prototype.setValue = function(value) {
this.value = value;
};
snabbtjs.Animation.prototype.updateCurrentTransform = function() {
var tweenValue = this.easing.value();
snabbtjs.TweenStates(this.startState, this.endState, this.currentState, tweenValue);
};
snabbtjs.Animation.prototype.completed = function() {
if(this.stopped)
return true;
if(this.startTime === 0) {
return false;
}
return this.easing.completed();
};
snabbtjs.Animation.prototype.updateElement = function(element) {
var matrix = this.currentState.asMatrix();
var properties = this.currentState.properties();
snabbtjs.setTransformOrigin(element, this.transformOrigin);
snabbtjs.updateElementTransform(element, matrix, this.perspective);
snabbtjs.updateElementProperties(element, properties);
};
// ------------------------------
// End Time animation
// ------------------------------
// ------------------------------
// Value feeded animation
// ------------------------------
snabbtjs.ValueFeededAnimation = function(options) {
this.valueFeeder = options.valueFeeder;
this.duration = options.duration || 500;
this.delay = options.delay || 0;
this.perspective = options.perspective;
this.easing = snabbtjs.createEaser('linear');
if(options.easing)
this.easing = snabbtjs.createEaser(options.easing, options);
this.currentState = new snabbtjs.State({});
this.currentMatrix = this.valueFeeder(0, new snabbtjs.Matrix());
this.transformOrigin = options.transformOrigin;
this.startTime = 0;
this.currentTime = 0;
this.stopped = false;
};
snabbtjs.ValueFeededAnimation.prototype.stop = function() {
this.stopped = true;
};
snabbtjs.ValueFeededAnimation.prototype.isStopped = function() {
return this.stopped;
};
snabbtjs.ValueFeededAnimation.prototype.tick = function(time) {
if(this.stopped)
<<<<<<<
snabbtjs.Animation.prototype.getCurrentState = function() {
return this.currentState;
=======
snabbtjs.Animation.prototype.setValue = function(value) {
this.value = value;
};
snabbtjs.Animation.prototype.currentState = function() {
return this._currentState;
>>>>>>>
snabbtjs.Animation.prototype.getCurrentState = function() {
return this.currentState;
};
snabbtjs.Animation.prototype.setValue = function(value) {
this.value = value; |
<<<<<<<
pan: {
enableTouch: false
},
propagateOriginTouch: false
=======
>>>>>>>
propagateOriginTouch: false |
<<<<<<<
var namespacedEvent;
if (event !== 'broker.subscribed') {
namespacedEvent = "" + routingKeyPrefix + "." + event;
return _this.on(namespacedEvent, function() {
=======
var handler;
if (event === 'broker.subscribed') {
return _this.on(event, handler = function(routingKeyPrefix1) {
if (routingKeyPrefix1 === channel.routingKeyPrefix) {
_this.authenticate(channel);
_this.off(event, handler);
return channel.emit(event, routingKeyPrefix1);
}
});
} else {
return _this.on("" + routingKeyPrefix + "." + event, function() {
>>>>>>>
var namespacedEvent;
if (event !== 'broker.subscribed') {
namespacedEvent = "" + routingKeyPrefix + "." + event;
return _this.on(namespacedEvent, function() {
<<<<<<<
channel.isAuthenticated = true;
=======
>>>>>>>
channel.isAuthenticated = true;
<<<<<<<
if (message.routingKey) {
this.emit(message.routingKey, message.payload);
=======
if (message.routingKey) {
if (message.routingKey === "broker.pong") {
this.emit("broker.pong");
}
if (message.payload) {
this.emit(message.routingKey, message.payload);
}
>>>>>>>
if (message.routingKey) {
if (message.routingKey === "broker.pong") {
this.emit("broker.pong");
}
if (message.payload) {
this.emit(message.routingKey, message.payload);
} |
<<<<<<<
var namespacedEvent;
if (event !== 'broker.subscribed') {
namespacedEvent = "" + routingKeyPrefix + "." + event;
return _this.on(namespacedEvent, function() {
=======
var handler;
if (event === 'broker.subscribed') {
return _this.on(event, handler = function(routingKeyPrefix1) {
if (routingKeyPrefix1 === channel.routingKeyPrefix) {
_this.authenticate(channel);
_this.off(event, handler);
return channel.emit(event, routingKeyPrefix1);
}
});
} else {
return _this.on("" + routingKeyPrefix + "." + event, function() {
>>>>>>>
var namespacedEvent;
if (event !== 'broker.subscribed') {
namespacedEvent = "" + routingKeyPrefix + "." + event;
return _this.on(namespacedEvent, function() {
<<<<<<<
channel.isAuthenticated = true;
=======
>>>>>>>
channel.isAuthenticated = true;
<<<<<<<
if (message.routingKey) {
this.emit(message.routingKey, message.payload);
=======
if (message.routingKey) {
if (message.routingKey === "broker.pong") {
this.emit("broker.pong");
}
if (message.payload) {
this.emit(message.routingKey, message.payload);
}
>>>>>>>
if (message.routingKey) {
if (message.routingKey === "broker.pong") {
this.emit("broker.pong");
}
if (message.payload) {
this.emit(message.routingKey, message.payload);
} |
<<<<<<<
=======
if (!process.env.INIT_CWD) {
return
}
const initCwd = resolve(process.env.INIT_CWD)
if (!existsSync(join(initCwd, 'node_modules'))) {
return
}
// Detect common presence of docs/nuxt.config.js or docs/nuxt.config.ts
if (existsSync(join(initCwd, 'docs', 'nuxt.config.js'))) {
return
}
if (existsSync(join(initCwd, 'docs', 'nuxt.config.ts'))) {
return
}
>>>>>>> |
<<<<<<<
var PictureXform = require('./picture-xform');
var DrawingXform = require('./drawing-xform');
=======
var AutoFilterXform = require('./auto-filter-xform');
>>>>>>>
var AutoFilterXform = require('./auto-filter-xform');
var PictureXform = require('./picture-xform');
var DrawingXform = require('./drawing-xform');
<<<<<<<
// prepare relationships
var rels = model.rels = [];
function nextRid(r) { return 'rId' + (r.length + 1); }
var rId;
model.hyperlinks.forEach(function(hyperlink) {
rId = nextRid(rels);
hyperlink.rId = rId;
rels.push({
Id: rId,
Type: RelType.Hyperlink,
Target: hyperlink.target,
TargetMode: 'External'
});
});
var drawingRelsHash = [];
var bookImage;
model.media.forEach(function(medium) {
if (medium.type === 'background') {
rId = nextRid(rels);
bookImage = options.media[medium.imageId];
rels.push({
Id: rId,
Type: RelType.Image,
Target: `../media/${bookImage.name}.${bookImage.extension}`,
});
model.background = {
rId,
};
model.image = options.media[medium.imageId];
} else if (medium.type === 'image') {
var drawing = model.drawing;
bookImage = options.media[medium.imageId];
if (!drawing) {
drawing = model.drawing = {
rId: nextRid(rels),
name: 'drawing' + (++options.drawingsCount),
anchors: [],
rels: [],
};
options.drawings.push(drawing);
rels.push({
Id: drawing.rId,
Type: 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing',
Target: '../drawings/' + drawing.name + '.xml',
});
}
var rIdImage = drawingRelsHash[medium.imageId];
if (!rIdImage) {
rIdImage = nextRid(drawing.rels);
drawingRelsHash[medium.imageId] = rIdImage;
drawing.rels.push({
Id: rIdImage,
Type: 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
Target: `../media/${bookImage.name}.${bookImage.extension}`,
});
}
drawing.anchors.push({
picture: {
rId: rIdImage,
},
range: medium.range,
});
}
});
=======
>>>>>>>
// prepare relationships
var rels = model.rels = [];
function nextRid(r) { return 'rId' + (r.length + 1); }
var rId;
model.hyperlinks.forEach(function(hyperlink) {
rId = nextRid(rels);
hyperlink.rId = rId;
rels.push({
Id: rId,
Type: RelType.Hyperlink,
Target: hyperlink.target,
TargetMode: 'External'
});
});
var drawingRelsHash = [];
var bookImage;
model.media.forEach(function(medium) {
if (medium.type === 'background') {
rId = nextRid(rels);
bookImage = options.media[medium.imageId];
rels.push({
Id: rId,
Type: RelType.Image,
Target: `../media/${bookImage.name}.${bookImage.extension}`,
});
model.background = {
rId,
};
model.image = options.media[medium.imageId];
} else if (medium.type === 'image') {
var drawing = model.drawing;
bookImage = options.media[medium.imageId];
if (!drawing) {
drawing = model.drawing = {
rId: nextRid(rels),
name: 'drawing' + (++options.drawingsCount),
anchors: [],
rels: [],
};
options.drawings.push(drawing);
rels.push({
Id: drawing.rId,
Type: 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing',
Target: '../drawings/' + drawing.name + '.xml',
});
}
var rIdImage = drawingRelsHash[medium.imageId];
if (!rIdImage) {
rIdImage = nextRid(drawing.rels);
drawingRelsHash[medium.imageId] = rIdImage;
drawing.rels.push({
Id: rIdImage,
Type: 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image',
Target: `../media/${bookImage.name}.${bookImage.extension}`,
});
}
drawing.anchors.push({
picture: {
rId: rIdImage,
},
range: medium.range,
});
}
});
<<<<<<<
this.map.hyperlinks.render(xmlStream, model.hyperlinks); // For some reason hyperlinks have to be after the data validations
=======
// For some reason hyperlinks have to be after the data validations
this.map.hyperlinks.render(xmlStream, model.hyperlinks);
>>>>>>>
// For some reason hyperlinks have to be after the data validations
this.map.hyperlinks.render(xmlStream, model.hyperlinks);
<<<<<<<
}
switch(name) {
case 'worksheet':
var properties = this.map.sheetFormatPr.model;
if (this.map.sheetPr.model && this.map.sheetPr.model.tabColor) {
properties.tabColor = this.map.sheetPr.model.tabColor;
}
var sheetProperties = {
fitToPage: (this.map.sheetPr.model && this.map.sheetPr.model.pageSetup && this.map.sheetPr.model.pageSetup.fitToPage) || false,
margins: this.map.pageMargins.model
};
var pageSetup = Object.assign(
sheetProperties,
this.map.pageSetup.model,
this.map.printOptions.model
);
this.model = {
dimensions: this.map.dimension.model,
cols: this.map.cols.model,
rows: this.map.sheetData.model,
mergeCells: this.map.mergeCells.model,
hyperlinks: this.map.hyperlinks.model,
dataValidations: this.map.dataValidations.model,
properties: properties,
views: this.map.sheetViews.model,
pageSetup: pageSetup,
background: this.map.picture.model,
drawing: this.map.drawing.model,
};
return false;
default:
// not quite sure how we get here!
return true;
=======
}
switch (name) {
case 'worksheet':
var properties = this.map.sheetFormatPr.model;
if (this.map.sheetPr.model && this.map.sheetPr.model.tabColor) {
properties.tabColor = this.map.sheetPr.model.tabColor;
}
var sheetProperties = {
fitToPage: (this.map.sheetPr.model && this.map.sheetPr.model.pageSetup && this.map.sheetPr.model.pageSetup.fitToPage) || false,
margins: this.map.pageMargins.model
};
var pageSetup = Object.assign(
sheetProperties,
this.map.pageSetup.model,
this.map.printOptions.model
);
this.model = {
dimensions: this.map.dimension.model,
cols: this.map.cols.model,
rows: this.map.sheetData.model,
mergeCells: this.map.mergeCells.model,
hyperlinks: this.map.hyperlinks.model,
dataValidations: this.map.dataValidations.model,
properties: properties,
views: this.map.sheetViews.model,
pageSetup: pageSetup
};
if (this.map.autoFilter.model) {
this.model.autoFilter = this.map.autoFilter.model;
}
return false;
default:
// not quite sure how we get here!
return true;
>>>>>>>
}
switch (name) {
case 'worksheet':
var properties = this.map.sheetFormatPr.model;
if (this.map.sheetPr.model && this.map.sheetPr.model.tabColor) {
properties.tabColor = this.map.sheetPr.model.tabColor;
}
var sheetProperties = {
fitToPage: (this.map.sheetPr.model && this.map.sheetPr.model.pageSetup && this.map.sheetPr.model.pageSetup.fitToPage) || false,
margins: this.map.pageMargins.model
};
var pageSetup = Object.assign(
sheetProperties,
this.map.pageSetup.model,
this.map.printOptions.model
);
this.model = {
dimensions: this.map.dimension.model,
cols: this.map.cols.model,
rows: this.map.sheetData.model,
mergeCells: this.map.mergeCells.model,
hyperlinks: this.map.hyperlinks.model,
dataValidations: this.map.dataValidations.model,
properties: properties,
views: this.map.sheetViews.model,
pageSetup: pageSetup,
background: this.map.picture.model,
drawing: this.map.drawing.model,
};
if (this.map.autoFilter.model) {
this.model.autoFilter = this.map.autoFilter.model;
}
return false;
default:
// not quite sure how we get here!
return true;
<<<<<<<
var rels = (model.relationships || []).reduce(function(h, rel) {
h[rel.Id] = rel;
return h;
}, {});
options.hyperlinkMap = (model.hyperlinks || []).reduce(function(h, hyperlink) {
h[hyperlink.address] = rels[hyperlink.rId].Target;
return h;
}, {});
=======
options.hyperlinkMap = new HyperlinkMap(model.relationships, model.hyperlinks);
options.formulae = {};
>>>>>>>
var rels = (model.relationships || []).reduce(function(h, rel) {
h[rel.Id] = rel;
return h;
}, {});
options.hyperlinkMap = (model.hyperlinks || []).reduce(function(h, hyperlink) {
h[hyperlink.address] = rels[hyperlink.rId].Target;
return h;
}, {});
options.formulae = {};
<<<<<<<
model.rows = (model.rows && model.rows.filter(function (row) {
return row;
})) || [];
=======
model.rows = (model.rows && model.rows.filter(Boolean)) || [];
>>>>>>>
model.rows = (model.rows && model.rows.filter(Boolean)) || [];
<<<<<<<
row.cells = (row.cells && row.cells.filter(function (cell) {
return cell;
})) || [];
=======
row.cells = (row.cells && row.cells.filter(Boolean)) || [];
>>>>>>>
row.cells = (row.cells && row.cells.filter(Boolean)) || []; |
<<<<<<<
const {PassThrough, Readable} = require('readable-stream');
const Stream = require('stream');
=======
const Stream = require('readable-stream');
const nodeStream = require('stream');
>>>>>>>
const {PassThrough, Readable} = require('readable-stream');
const nodeStream = require('stream');
<<<<<<<
if (input instanceof Stream.Readable || input instanceof Readable) {
=======
if (input instanceof Stream.Readable || input instanceof nodeStream.Readable) {
>>>>>>>
if (input instanceof nodeStream.Readable || input instanceof Readable) { |
<<<<<<<
const HeaderFooterXform = require('../../xlsx/xform/sheet/header-footer-xform');
=======
const RowBreaksXform = require('../../xlsx/xform/sheet/row-breaks-xform');
>>>>>>>
const HeaderFooterXform = require('../../xlsx/xform/sheet/header-footer-xform');
const RowBreaksXform = require('../../xlsx/xform/sheet/row-breaks-xform');
<<<<<<<
headerFooter: new HeaderFooterXform(),
=======
rowBreaks: new RowBreaksXform(),
>>>>>>>
headerFooter: new HeaderFooterXform(),
rowBreaks: new RowBreaksXform(),
<<<<<<<
this._writeHeaderFooter();
=======
this._writeRowBreaks();
>>>>>>>
this._writeHeaderFooter();
this._writeRowBreaks(); |
<<<<<<<
// if (!(row instanceof Row)) {
// throw new Error('Expected row to be Row, was ' + typeof row);
// }
// if (!(column instanceof Column)) {
// throw new Error('Expected col to be Column, was ' + typeof column);
// }
=======
>>>>>>>
<<<<<<<
if (this.type === Cell.Types.Merge) return this._value.master;
return this; // an unmerged cell is its own master
=======
if (this.type === Cell.Types.Merge) {
return this._value.master;
}
return this; // an unmerged cell is its own master
>>>>>>>
if (this.type === Cell.Types.Merge) {
return this._value.master;
}
return this; // an unmerged cell is its own master
<<<<<<<
return Enums.ValueType.Null;
=======
return Enums.ValueType.Null;
>>>>>>>
return Enums.ValueType.Null;
<<<<<<<
return Cell.Types.JSON;
=======
return Cell.Types.JSON;
// console.log('Error: value=' + value + ', type=' + typeof value)
// throw new Error('I could not understand type of value: ' + JSON.stringify(value) + ' - typeof: ' + typeof value);
>>>>>>>
return Cell.Types.JSON;
<<<<<<<
].reduce(function (p,t) { p[t.t] = t.f; return p; }, []),
=======
].reduce((p,t) => { p[t.t] = t.f; return p; }, []),
>>>>>>>
].reduce((p,t) => { p[t.t] = t.f; return p; }, []), |
<<<<<<<
// for images, etc
this._media = [];
=======
this.autoFilter = options.autoFilter || null;
>>>>>>>
this.autoFilter = options.autoFilter || null;
// for images, etc
this._media = [];
<<<<<<<
var headerCount =
(cv.header && 1) ||
(cv.headers && cv.headers.length) ||
0;
=======
var headerCount =
(cv.header && 1) ||
(cv.headers && cv.headers.length) ||
0;
>>>>>>>
var headerCount =
(cv.header && 1) ||
(cv.headers && cv.headers.length) ||
0;
<<<<<<<
// each member of inserts is a column of data.
var i;
=======
// each member of inserts is a column of data.
>>>>>>>
// each member of inserts is a column of data.
var i;
<<<<<<<
this._rows.forEach(function(_row) {
if (_row) {
_row.splice(start, count);
}
=======
this._rows.forEach(function(r) {
if (r) { r.splice(start, count); }
>>>>>>>
this._rows.forEach(function(r) {
if (r) { r.splice(start, count); }
<<<<<<<
this._rows[i + nExpand - 1] = undefined;
=======
this._rows[(i + nExpand) - 1] = undefined;
>>>>>>>
this._rows[(i + nExpand) - 1] = undefined;
<<<<<<<
this._rows[i + nExpand - 1] = undefined;
=======
this._rows[(i + nExpand) - 1] = undefined;
>>>>>>>
this._rows[(i + nExpand) - 1] = undefined;
<<<<<<<
// =========================================================================
// Images
addImage: function addImageToCells(imageId, range) {
this._media.push({
type: 'image',
imageId,
range,
});
},
addBackgroundImage: function(imageId, options) {
this._media.push(
Object.assign({}, options, {
type: 'background',
imageId,
})
);
},
=======
// ===========================================================================
// Shared Formula
fillFormula: function(range, formula, results) {
// Define formula for top-left cell and share to rest
var decoded = colCache.decode(range);
var { top, left, bottom, right } = decoded;
var width = (right - left) + 1;
var masterAddress = colCache.encodeAddress(top, left);
// work out result accessor
var getResult;
if (typeof results === 'function') {
getResult = results;
} else if (Array.isArray(results)) {
if (Array.isArray(results[0])) {
getResult = (row, col) => results[row - top][col - left];
} else {
getResult = (row, col) => results[(row - top) * width + (col - left)];
}
} else {
getResult = () => undefined;
}
var first = true;
for (var r = top; r <= bottom; r++) {
for (var c = left; c <= right; c++) {
if (first) {
this.getCell(r,c).value = {
formula,
result: getResult(r, c),
};
first = false;
} else {
this.getCell(r,c).value = {
sharedFormula: masterAddress,
result: getResult(r, c),
};
}
}
}
},
>>>>>>>
// ===========================================================================
// Shared Formula
fillFormula: function(range, formula, results) {
// Define formula for top-left cell and share to rest
var decoded = colCache.decode(range);
var { top, left, bottom, right } = decoded;
var width = (right - left) + 1;
var masterAddress = colCache.encodeAddress(top, left);
// work out result accessor
var getResult;
if (typeof results === 'function') {
getResult = results;
} else if (Array.isArray(results)) {
if (Array.isArray(results[0])) {
getResult = (row, col) => results[row - top][col - left];
} else {
getResult = (row, col) => results[(row - top) * width + (col - left)];
}
} else {
getResult = () => undefined;
}
var first = true;
for (var r = top; r <= bottom; r++) {
for (var c = left; c <= right; c++) {
if (first) {
this.getCell(r,c).value = {
formula,
result: getResult(r, c),
};
first = false;
} else {
this.getCell(r,c).value = {
sharedFormula: masterAddress,
result: getResult(r, c),
};
}
}
}
},
// =========================================================================
// Images
addImage: function addImageToCells(imageId, range) {
this._media.push({
type: 'image',
imageId,
range,
});
},
addBackgroundImage: function(imageId, options) {
this._media.push(
Object.assign({}, options, {
type: 'background',
imageId,
})
);
},
<<<<<<<
views: this.views,
media: this._media,
=======
views: this.views,
autoFilter: this.autoFilter
>>>>>>>
views: this.views,
autoFilter: this.autoFilter,
media: this._media,
<<<<<<<
this._media = value.media;
=======
this.autoFilter = value.autoFilter;
>>>>>>>
this.autoFilter = value.autoFilter;
this._media = value.media; |
<<<<<<<
describe('with a spreadsheet that contains images', function () {
before(function () {
var testContext = this;
var workbook = new Excel.Workbook();
return workbook.xlsx.read(fs.createReadStream('./spec/integration/data/images.xlsx'))
.then(function () {
testContext.worksheet = workbook.getWorksheet();
});
});
describe('with image`s tl anchor', function () {
it('Should integer part of col equals nativeCol', function () {
this.worksheet.getImages().forEach(function (image) {
expect(Math.floor(image.range.tl.col)).to.equal(image.range.tl.nativeCol);
})
});
it('Should integer part of row equals nativeRow', function () {
this.worksheet.getImages().forEach(function (image) {
expect(Math.floor(image.range.tl.row)).to.equal(image.range.tl.nativeRow);
})
});
it('Should anchor width equals to column width when custom', function () {
var ws = this.worksheet;
ws.getImages().forEach(function (image) {
var col = ws.getColumn(image.range.tl.nativeCol + 1);
if (col.isCustomWidth) {
expect(image.range.tl.colWidth).to.equal(Math.floor(col.width * 10000));
} else {
expect(image.range.tl.colWidth).to.equal(640000);
}
})
});
it('Should anchor height equals to row height', function () {
var ws = this.worksheet;
ws.getImages().forEach(function (image) {
var row = ws.getRow(image.range.tl.nativeRow + 1);
if (row.height) {
expect(image.range.tl.rowHeight).to.equal(Math.floor(row.height * 10000));
} else {
expect(image.range.tl.rowHeight).to.equal(180000);
}
})
});
});
describe('with image`s br anchor', function () {
it('Should integer part of col equals nativeCol', function () {
this.worksheet.getImages().forEach(function (image) {
expect(Math.floor(image.range.br.col)).to.equal(image.range.br.nativeCol);
})
});
it('Should integer part of row equals nativeRow', function () {
this.worksheet.getImages().forEach(function (image) {
expect(Math.floor(image.range.br.row)).to.equal(image.range.br.nativeRow);
})
});
it('Should anchor width equals to column width when custom', function () {
var ws = this.worksheet;
ws.getImages().forEach(function (image) {
var col = ws.getColumn(image.range.br.nativeCol + 1);
if (col.isCustomWidth) {
expect(image.range.br.colWidth).to.equal(Math.floor(col.width * 10000));
} else {
expect(image.range.br.colWidth).to.equal(640000);
}
})
});
it('Should anchor height equals to row height', function () {
var ws = this.worksheet;
ws.getImages().forEach(function (image) {
var row = ws.getRow(image.range.br.nativeRow + 1);
if (row.height) {
expect(image.range.br.rowHeight).to.equal(Math.floor(row.height * 10000));
} else {
expect(image.range.br.rowHeight).to.equal(180000);
}
})
});
});
});
=======
describe('with a spreadsheet containing a defined name that kinda looks like it contains a range', function() {
it('should not crash', function() {
var workbook = new Excel.Workbook();
return workbook.xlsx.read(fs.createReadStream('./spec/integration/data/bogus-defined-name.xlsx'));
});
});
>>>>>>>
describe('with a spreadsheet that contains images', function () {
before(function () {
var testContext = this;
var workbook = new Excel.Workbook();
return workbook.xlsx.read(fs.createReadStream('./spec/integration/data/images.xlsx'))
.then(function () {
testContext.worksheet = workbook.getWorksheet();
});
});
describe('with image`s tl anchor', function () {
it('Should integer part of col equals nativeCol', function () {
this.worksheet.getImages().forEach(function (image) {
expect(Math.floor(image.range.tl.col)).to.equal(image.range.tl.nativeCol);
})
});
it('Should integer part of row equals nativeRow', function () {
this.worksheet.getImages().forEach(function (image) {
expect(Math.floor(image.range.tl.row)).to.equal(image.range.tl.nativeRow);
})
});
it('Should anchor width equals to column width when custom', function () {
var ws = this.worksheet;
ws.getImages().forEach(function (image) {
var col = ws.getColumn(image.range.tl.nativeCol + 1);
if (col.isCustomWidth) {
expect(image.range.tl.colWidth).to.equal(Math.floor(col.width * 10000));
} else {
expect(image.range.tl.colWidth).to.equal(640000);
}
})
});
it('Should anchor height equals to row height', function () {
var ws = this.worksheet;
ws.getImages().forEach(function (image) {
var row = ws.getRow(image.range.tl.nativeRow + 1);
if (row.height) {
expect(image.range.tl.rowHeight).to.equal(Math.floor(row.height * 10000));
} else {
expect(image.range.tl.rowHeight).to.equal(180000);
}
})
});
});
describe('with image`s br anchor', function () {
it('Should integer part of col equals nativeCol', function () {
this.worksheet.getImages().forEach(function (image) {
expect(Math.floor(image.range.br.col)).to.equal(image.range.br.nativeCol);
})
});
it('Should integer part of row equals nativeRow', function () {
this.worksheet.getImages().forEach(function (image) {
expect(Math.floor(image.range.br.row)).to.equal(image.range.br.nativeRow);
})
});
it('Should anchor width equals to column width when custom', function () {
var ws = this.worksheet;
ws.getImages().forEach(function (image) {
var col = ws.getColumn(image.range.br.nativeCol + 1);
if (col.isCustomWidth) {
expect(image.range.br.colWidth).to.equal(Math.floor(col.width * 10000));
} else {
expect(image.range.br.colWidth).to.equal(640000);
}
})
});
it('Should anchor height equals to row height', function () {
var ws = this.worksheet;
ws.getImages().forEach(function (image) {
var row = ws.getRow(image.range.br.nativeRow + 1);
if (row.height) {
expect(image.range.br.rowHeight).to.equal(Math.floor(row.height * 10000));
} else {
expect(image.range.br.rowHeight).to.equal(180000);
}
})
});
describe('with a spreadsheet containing a defined name that kinda looks like it contains a range', function() {
it('should not crash', function() {
var workbook = new Excel.Workbook();
return workbook.xlsx.read(fs.createReadStream('./spec/integration/data/bogus-defined-name.xlsx'));
});
}); |
<<<<<<<
.then(content => {
// console.log('zip finalize', typeof content, content)
this.stream.end(content);
this.emit('finish');
=======
.then(function(content) {
self.stream.end(content);
self.emit('finish');
>>>>>>>
.then(content => {
this.stream.end(content);
this.emit('finish'); |
<<<<<<<
this.sheetProtection.sheet = undefined;
=======
this.sheetProtection.algorithmName = undefined;
this.sheetProtection.saltValue = undefined;
this.sheetProtection.spinCount = undefined;
this.sheetProtection.hashValue = undefined;
// =========================================================================
// Tables
addTable(model) {
const table = new Table(this, model);
this.tables[model.name] = table;
return table;
}
getTable(name) {
return this.tables[name];
}
removeTable(name) {
delete this.tables[name];
}
getTables() {
return Object.values(this.tables);
>>>>>>>
this.sheetProtection.sheet = undefined;
this.sheetProtection.algorithmName = undefined;
this.sheetProtection.saltValue = undefined;
this.sheetProtection.spinCount = undefined;
this.sheetProtection.hashValue = undefined;
}
// =========================================================================
// Tables
addTable(model) {
const table = new Table(this, model);
this.tables[model.name] = table;
return table;
}
getTable(name) {
return this.tables[name];
}
removeTable(name) {
delete this.tables[name];
}
getTables() {
return Object.values(this.tables); |
<<<<<<<
zipStream.on('done', function () {
deferred.resolve(self.workbook);
}).on('error', function (error) {
deferred.reject(error);
=======
return new Promise(function(resolve, reject) {
zipStream.on("done", function () {
resolve(self.workbook);
}).on("error", function (error) {
reject(error);
});
stream.pipe(zipStream);
>>>>>>>
return new Promise(function(resolve, reject) {
zipStream.on('done', function () {
resolve(self.workbook);
}).on('error', function (error) {
reject(error);
});
stream.pipe(zipStream); |
<<<<<<<
=======
var RelType = require('../../rel-type');
var Range = require('../../../doc/range');
>>>>>>>
var RelType = require('../../rel-type');
var Range = require('../../../doc/range');
<<<<<<<
default:
break;
=======
case Enums.ValueType.Formula:
if (options.date1904) {
// in case valueType is date
model.date1904 = true;
}
if (model.formula) {
options.formulae[model.address] = model;
} else if (model.sharedFormula) {
const master = options.formulae[model.sharedFormula];
if (!master) {
throw new Error('Shared Formula master must exist above and or left of clone');
}
if (master.si !== undefined) {
model.si = master.si;
master.ref.expandToAddress(model.address);
} else {
model.si = master.si = options.siFormulae++;
master.ref = new Range(master.address, model.address);
}
}
break
default:
break;
}
},
renderFormula: function(xmlStream, model) {
var attrs = null;
if (model.ref) {
attrs = {
t: 'shared',
ref: model.ref.range,
si: model.si,
};
} else if (model.si !== undefined) {
attrs = {
t: 'shared',
si: model.si,
};
}
switch (getValueType(model.result)) {
case Enums.ValueType.Null: // ?
xmlStream.leafNode('f', attrs, model.formula);
break;
case Enums.ValueType.String:
// oddly, formula results don't ever use shared strings
xmlStream.addAttribute('t', 'str');
xmlStream.leafNode('f', attrs, model.formula);
xmlStream.leafNode('v', null, model.result);
break;
case Enums.ValueType.Number:
xmlStream.leafNode('f', attrs, model.formula);
xmlStream.leafNode('v', null, model.result);
break;
case Enums.ValueType.Boolean:
xmlStream.addAttribute('t', 'b');
xmlStream.leafNode('f', attrs, model.formula);
xmlStream.leafNode('v', null, model.result ? 1 : 0);
break;
case Enums.ValueType.Error:
xmlStream.addAttribute('t', 'e');
xmlStream.leafNode('f', attrs, model.formula);
xmlStream.leafNode('v', null, model.result.error);
break;
case Enums.ValueType.Date:
xmlStream.leafNode('f', attrs, model.formula);
xmlStream.leafNode('v', null, utils.dateToExcel(model.result, model.date1904));
break;
// case Enums.ValueType.Hyperlink: // ??
// case Enums.ValueType.Formula:
default:
throw new Error('I could not understand type of value');
>>>>>>>
case Enums.ValueType.Formula:
if (options.date1904) {
// in case valueType is date
model.date1904 = true;
}
if (model.formula) {
options.formulae[model.address] = model;
} else if (model.sharedFormula) {
const master = options.formulae[model.sharedFormula];
if (!master) {
throw new Error('Shared Formula master must exist above and or left of clone');
}
if (master.si !== undefined) {
model.si = master.si;
master.ref.expandToAddress(model.address);
} else {
model.si = master.si = options.siFormulae++;
master.ref = new Range(master.address, model.address);
}
}
break
default:
break;
}
},
renderFormula: function(xmlStream, model) {
var attrs = null;
if (model.ref) {
attrs = {
t: 'shared',
ref: model.ref.range,
si: model.si,
};
} else if (model.si !== undefined) {
attrs = {
t: 'shared',
si: model.si,
};
}
switch (getValueType(model.result)) {
case Enums.ValueType.Null: // ?
xmlStream.leafNode('f', attrs, model.formula);
break;
case Enums.ValueType.String:
// oddly, formula results don't ever use shared strings
xmlStream.addAttribute('t', 'str');
xmlStream.leafNode('f', attrs, model.formula);
xmlStream.leafNode('v', null, model.result);
break;
case Enums.ValueType.Number:
xmlStream.leafNode('f', attrs, model.formula);
xmlStream.leafNode('v', null, model.result);
break;
case Enums.ValueType.Boolean:
xmlStream.addAttribute('t', 'b');
xmlStream.leafNode('f', attrs, model.formula);
xmlStream.leafNode('v', null, model.result ? 1 : 0);
break;
case Enums.ValueType.Error:
xmlStream.addAttribute('t', 'e');
xmlStream.leafNode('f', attrs, model.formula);
xmlStream.leafNode('v', null, model.result.error);
break;
case Enums.ValueType.Date:
xmlStream.leafNode('f', attrs, model.formula);
xmlStream.leafNode('v', null, utils.dateToExcel(model.result, model.date1904));
break;
// case Enums.ValueType.Hyperlink: // ??
// case Enums.ValueType.Formula:
default:
throw new Error('I could not understand type of value');
<<<<<<<
switch (getValueType(model.result)) {
case Enums.ValueType.Null: // ?
xmlStream.leafNode('f', null, model.formula);
break;
case Enums.ValueType.String:
// oddly, formula results don't ever use shared strings
xmlStream.addAttribute('t', 'str');
xmlStream.leafNode('f', null, model.formula);
xmlStream.leafNode('v', null, model.result);
break;
case Enums.ValueType.Number:
xmlStream.leafNode('f', null, model.formula);
xmlStream.leafNode('v', null, model.result);
break;
case Enums.ValueType.Boolean:
xmlStream.addAttribute('t', 'b');
xmlStream.leafNode('f', null, model.formula);
xmlStream.leafNode('v', null, model.result ? 1 : 0);
break;
case Enums.ValueType.Error:
xmlStream.addAttribute('t', 'e');
xmlStream.leafNode('f', null, model.formula);
xmlStream.leafNode('v', null, model.result.error);
break;
case Enums.ValueType.Date:
xmlStream.leafNode('f', null, model.formula);
xmlStream.leafNode('v', null, utils.dateToExcel(model.result, model.date1904));
break;
// case Enums.ValueType.Hyperlink: // ??
// case Enums.ValueType.Formula:
default:
throw new Error('I could not understand type of value');
}
=======
this.renderFormula(xmlStream, model);
>>>>>>>
this.renderFormula(xmlStream, model);
<<<<<<<
default:
break;
=======
default:
break;
>>>>>>>
default:
break;
<<<<<<<
model.result = parseInt(model.value) !== 0;
=======
model.result = parseInt(model.value, 10) !== 0;
>>>>>>>
model.result = parseInt(model.value, 10) !== 0; |
<<<<<<<
'!<%= dirs.devJsSrc %>/login-form-popup.js',
'!<%= dirs.devJsSrc %>/dokan-maps-compat.js'
=======
'!<%= dirs.devJsSrc %>/login-form-popup.js',
'!<%= dirs.devJsSrc %>/setup-no-wc.js'
>>>>>>>
'!<%= dirs.devJsSrc %>/login-form-popup.js',
'!<%= dirs.devJsSrc %>/dokan-maps-compat.js'
'!<%= dirs.devJsSrc %>/setup-no-wc.js' |
<<<<<<<
/* empty harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_aa8ad7dc_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_Switches_vue__ = __webpack_require__(28);
=======
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_aa8ad7dc_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_Switches_vue__ = __webpack_require__(27);
>>>>>>>
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_aa8ad7dc_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_Switches_vue__ = __webpack_require__(28);
<<<<<<<
/* empty harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_40b3524c_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_UploadImage_vue__ = __webpack_require__(30);
=======
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_40b3524c_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_UploadImage_vue__ = __webpack_require__(29);
>>>>>>>
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_40b3524c_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_UploadImage_vue__ = __webpack_require__(30);
<<<<<<<
/* empty harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_4084a478_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_PasswordGenerator_vue__ = __webpack_require__(31);
=======
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_4084a478_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_PasswordGenerator_vue__ = __webpack_require__(30);
>>>>>>>
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_4084a478_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_PasswordGenerator_vue__ = __webpack_require__(31);
<<<<<<<
/* empty harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_01dc0d51_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_ColorPicker_vue__ = __webpack_require__(25);
=======
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_01dc0d51_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_ColorPicker_vue__ = __webpack_require__(24);
>>>>>>>
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_01dc0d51_hasScoped_true_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_ColorPicker_vue__ = __webpack_require__(25);
<<<<<<<
/* empty harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_2b13daea_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_VendorAccountFields_vue__ = __webpack_require__(32);
=======
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_2b13daea_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_VendorAccountFields_vue__ = __webpack_require__(31);
>>>>>>>
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_2b13daea_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_VendorAccountFields_vue__ = __webpack_require__(32);
<<<<<<<
/* empty harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_9504c01e_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_VendorAddressFields_vue__ = __webpack_require__(34);
=======
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_9504c01e_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_VendorAddressFields_vue__ = __webpack_require__(33);
>>>>>>>
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_9504c01e_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_VendorAddressFields_vue__ = __webpack_require__(34);
<<<<<<<
/* empty harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_2ed34783_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_VendorPaymentFields_vue__ = __webpack_require__(37);
=======
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_2ed34783_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_VendorPaymentFields_vue__ = __webpack_require__(36);
>>>>>>>
/* unused harmony namespace reexport */
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__node_modules_vue_loader_lib_template_compiler_index_id_data_v_2ed34783_hasScoped_false_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_VendorPaymentFields_vue__ = __webpack_require__(37);
<<<<<<<
dokan.api.put('/withdraw/' + this.editing.id, {
note: this.editing.note
}).done(response => {
this.loading = false;
=======
_this5.updateItem(_this5.editing.id, response);
>>>>>>>
_this5.updateItem(_this5.editing.id, response);
<<<<<<<
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_slick_carousel_slick_slick_css__ = __webpack_require__(109);
=======
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_slick_carousel_slick_slick_css__ = __webpack_require__(111);
>>>>>>>
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_slick_carousel_slick_slick_css__ = __webpack_require__(113);
<<<<<<<
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_slick__ = __webpack_require__(112);
=======
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_slick__ = __webpack_require__(114);
>>>>>>>
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_slick__ = __webpack_require__(116);
<<<<<<<
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_admin_components_Fields_vue__ = __webpack_require__(121);
=======
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_admin_components_Fields_vue__ = __webpack_require__(123);
>>>>>>>
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_admin_components_Fields_vue__ = __webpack_require__(125);
<<<<<<<
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_admin_components_ColorPicker_vue__ = __webpack_require__(23);
=======
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_runtime_helpers_defineProperty__ = __webpack_require__(125);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_runtime_helpers_defineProperty___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0__babel_runtime_helpers_defineProperty__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__babel_runtime_helpers_slicedToArray__ = __webpack_require__(126);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__babel_runtime_helpers_slicedToArray___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1__babel_runtime_helpers_slicedToArray__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_admin_components_ColorPicker_vue__ = __webpack_require__(22);
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { __WEBPACK_IMPORTED_MODULE_0__babel_runtime_helpers_defineProperty___default()(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
>>>>>>>
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_runtime_helpers_defineProperty__ = __webpack_require__(127);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_runtime_helpers_defineProperty___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0__babel_runtime_helpers_defineProperty__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__babel_runtime_helpers_slicedToArray__ = __webpack_require__(128);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__babel_runtime_helpers_slicedToArray___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1__babel_runtime_helpers_slicedToArray__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_admin_components_ColorPicker_vue__ = __webpack_require__(23);
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { __WEBPACK_IMPORTED_MODULE_0__babel_runtime_helpers_defineProperty___default()(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
<<<<<<<
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AddVendor_vue__ = __webpack_require__(146);
=======
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AddVendor_vue__ = __webpack_require__(153);
>>>>>>>
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AddVendor_vue__ = __webpack_require__(155);
<<<<<<<
/* 91 */,
/* 92 */,
/* 93 */
/***/ (function(module, exports, __webpack_require__) {
=======
/* 91 */,
/* 92 */,
/* 93 */,
/* 94 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
>>>>>>>
/* 91 */,
/* 92 */,
/* 93 */,
/* 94 */,
/* 95 */,
/* 96 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
<<<<<<<
/* 97 */
/***/ (function(module, exports, __webpack_require__) {
=======
/* 98 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
>>>>>>>
/* 100 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
<<<<<<<
/* 140 */,
/* 141 */,
/* 142 */
=======
/* 140 */,
/* 141 */,
/* 142 */,
/* 143 */,
/* 144 */,
/* 145 */,
/* 146 */,
/* 147 */,
/* 148 */,
/* 149 */
>>>>>>>
/* 140 */,
/* 141 */,
/* 142 */,
/* 143 */,
/* 144 */,
/* 145 */,
/* 146 */,
/* 147 */,
/* 148 */,
/* 149 */,
/* 150 */,
/* 151 */
<<<<<<<
/* 143 */
=======
/* 150 */
>>>>>>>
/* 152 */
<<<<<<<
/* 149 */
=======
/* 156 */
>>>>>>>
/* 158 */
<<<<<<<
/* 150 */
/***/ (function(module, exports, __webpack_require__) {
=======
/* 157 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
>>>>>>>
/* 159 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
<<<<<<<
],[93]);
=======
],[94]);
>>>>>>>
],[96]); |
<<<<<<<
this.click = __bind(this.click, this);
=======
var row;
>>>>>>>
this.click = __bind(this.click, this);
var row;
<<<<<<<
function DonutSegment(cx, cy, inner, outer, p0, p1, color, data, idx) {
=======
function DonutSegment(cx, cy, inner, outer, p0, p1, color, backgroundColor, index, raphael) {
>>>>>>>
function DonutSegment(cx, cy, inner, outer, p0, p1, color, backgroundColor, data, index, raphael) {
<<<<<<<
this.data = data;
this.idx = idx;
=======
this.backgroundColor = backgroundColor;
this.index = index;
this.raphael = raphael;
>>>>>>>
this.backgroundColor = backgroundColor;
this.data = data;
this.index = index;
this.raphael = raphael;
<<<<<<<
}).hover(function() {
return _this.fire('hover', _this);
}).click(function() {
return _this.fire('click', _this);
});
=======
}).hover(hoverFunction);
>>>>>>>
}).hover(hoverFunction).click(clickFunction); |
<<<<<<<
assert(dependencies.log);
=======
assert(dependencies.consoleLogger);
assert(dependencies.sdkPath);
>>>>>>>
assert(dependencies.log);
assert(dependencies.sdkPath);
<<<<<<<
this._log = dependencies.log;
=======
this._consoleLogger = dependencies.consoleLogger;
this._sdkPath = dependencies.sdkPath;
>>>>>>>
this._log = dependencies.log;
this._sdkPath = dependencies.sdkPath;
<<<<<<<
const command = this._getCommand(runInInteractiveMode, projectFolder, commandMetadata);
const commandArguments = this._extractOptionValuesFromArguments(commandMetadata.options, args);
=======
const command = this._commandInstanceFactory.create({
runInInteractiveMode: runInInteractiveMode,
commandMetadata: commandMetadata,
projectFolder: projectFolder,
executionPath: this._executionPath,
consoleLogger: this._consoleLogger,
sdkPath: this._sdkPath,
});
const commandArguments = this._extractOptionValuesFromArguments(command.commandMetadata.options, args);
>>>>>>>
const command = this._getCommand(runInInteractiveMode, projectFolder, commandMetadata);
const commandArguments = this._extractOptionValuesFromArguments(commandMetadata.options, args); |
<<<<<<<
const { unwrapExceptionMessage, unwrapInformationMessage } = require('../utils/ExceptionUtils');
const AuthenticationService = require('../services/AuthenticationService');
=======
const { ActionResult } = require('../commands/actionresult/ActionResult');
const OutputFormatter = require('../commands/outputFormatters/OutputFormatter');
const { getProjectDefaultAuthId } = require('../utils/AuthenticationUtils');
>>>>>>>
const { unwrapExceptionMessage, unwrapInformationMessage } = require('../utils/ExceptionUtils');
const { getProjectDefaultAuthId } = require('../utils/AuthenticationUtils');
<<<<<<<
=======
assert(dependencies.commandOptionsValidator);
>>>>>>>
<<<<<<<
assert(dependencies.log);
=======
assert(dependencies.consoleLogger);
>>>>>>>
assert(dependencies.log);
<<<<<<<
this._executionPath = dependencies.executionPath;
=======
this._executionPath = dependencies.executionPath ? dependencies.executionPath : process.cwd();
this._commandOptionsValidator = dependencies.commandOptionsValidator;
>>>>>>>
this._executionPath = dependencies.executionPath;
<<<<<<<
this._log = dependencies.log;
=======
this._consoleLogger = dependencies.consoleLogger;
>>>>>>>
this._log = dependencies.log;
<<<<<<<
const projectConfiguration = commandMetadata.isSetupRequired ? AuthenticationService.getProjectDefaultAuthId(this._executionPath) : null;
=======
const projectConfiguration = commandMetadata.isSetupRequired ? getProjectDefaultAuthId(this._executionPath) : null;
>>>>>>>
const projectConfiguration = commandMetadata.isSetupRequired ? getProjectDefaultAuthId(this._executionPath) : null; |
<<<<<<<
const ProjectMetadataService = require('../services/ProjectMetadataService');
=======
const SDKExecutionContext = require('../SDKExecutionContext');
const ProjectInfoService = require('../services/ProjectInfoService');
const ValidateSDFProjectUtils = require('../utils/ValidateSDFProjectUtils');
>>>>>>>
const ProjectInfoService = require('../services/ProjectInfoService');
const ValidateSDFProjectUtils = require('../utils/ValidateSDFProjectUtils');
<<<<<<<
includeAccountDetailsParams: true,
params: SDKDeployParams,
=======
params: SDKParams,
>>>>>>>
includeAccountDetailsParams: true,
params: SDKParams, |
<<<<<<<
// if (answers.hasOwnProperty(COMMAND.OPTIONS.REVOKE)) {
// return ACTION.REVOKE;
// }
throwValidationException([NodeTranslationService.getMessage(ERRORS.UNKNOWN_ACTION)], this._runInInteractiveMode, this._commandMetadata);
=======
assert.fail(NodeTranslationService.getMessage(ERRORS.UNKNOWN_ACTION));
>>>>>>>
throwValidationException([NodeTranslationService.getMessage(ERRORS.UNKNOWN_ACTION)], this._runInInteractiveMode, this._commandMetadata); |
<<<<<<<
=======
const CommandInstanceFactory = jest.fn(() => ({
create: jest.fn(() => {
return {
commandMetadata: { options: {} },
getCommandQuestions: jest.fn(),
actionFunc: jest.fn(() =>
ActionResult.Builder.withData([])
.withResultMessage('')
.build()
),
outputFormatter: new OutputFormatter(),
consoleLogger: mockConsoleLogger,
};
}),
}));
>>>>>>>
<<<<<<<
=======
commandInstanceFactory: new CommandInstanceFactory(),
>>>>>>>
<<<<<<<
=======
commandInstanceFactory: new CommandInstanceFactory(),
>>>>>>>
<<<<<<<
=======
commandInstanceFactory: new CommandInstanceFactory(),
>>>>>>> |
<<<<<<<
=======
const EnvironmentInformationService = require('./services/EnvironmentInformationService');
const AccountDetailsService = require('./core/accountsetup/AccountDetailsService');
>>>>>>>
const EnvironmentInformationService = require('./services/EnvironmentInformationService');
<<<<<<<
module.exports.SDKExecutor = class SDKExecutor {
=======
const DATA_EVENT = 'data';
const CLOSE_EVENT = 'close';
const UTF8 = 'utf8';
module.exports.SDKExecutor = class SDKExecutor {
>>>>>>>
const DATA_EVENT = 'data';
const CLOSE_EVENT = 'close';
const UTF8 = 'utf8';
module.exports.SDKExecutor = class SDKExecutor {
<<<<<<<
this._authenticationService = new AuthenticationService();
=======
this._accountDetailsService = new AccountDetailsService();
this._environmentInformationService = new EnvironmentInformationService();
>>>>>>>
this._authenticationService = new AuthenticationService();
this._environmentInformationService = new EnvironmentInformationService();
<<<<<<<
const authId = executionContext.includeProjectDefaultAuthId
? this._authenticationService.getProjectDefaultAuthId()
: null;
=======
const accountDetails = executionContext.includeAccountDetailsParams
? this._accountDetailsService.get()
: null;
>>>>>>>
const authId = executionContext.includeProjectDefaultAuthId
? this._authenticationService.getProjectDefaultAuthId()
: null;
<<<<<<<
const developmentModeOption = SDK_DEVELOPMENT_MODE_JVM_OPTION; //HARDCODED: this should be in the SDK
=======
const developmentModeOption =
accountDetails && accountDetails.isDevelopment
? SDK_DEVELOPMENT_MODE_JVM_OPTION
: '';
>>>>>>>
const developmentModeOption = SDK_DEVELOPMENT_MODE_JVM_OPTION; //HARDCODED: this should be in the SDK |
<<<<<<<
_validateArrayIsNotEmpty(array) {
return array.length > 0 ? true : NodeUtils.formatString("Error: You should choose at least one option.", {color: NodeUtils.COLORS.RED, bold: true})
=======
_validateArrayIsNotEmpty(array){
return array.length > 0 ? true : NodeUtils.formatString(TranslationService.getMessageTranslationKeys(TranslationKeys.ERROR_CHOOSE_OPTION), {color: NodeUtils.COLORS.RED, bold: true})
>>>>>>>
_validateArrayIsNotEmpty(array) {
return array.length > 0 ? true : NodeUtils.formatString(TranslationService.getMessageTranslationKeys(TranslationKeys.ERROR_CHOOSE_OPTION), {color: NodeUtils.COLORS.RED, bold: true})
<<<<<<<
if (ProjectContextService.getProjectType() === PROJECT_SUITEAPP) {
=======
if(ProjectContextService.getProjectType() === PROJECT_SUITEAPP){
let message = TranslationService.getMessage(QUESTIONS.SPECIFIC_APPID,
NodeUtils.formatString(WORDS.SUITE_APP, {color: NodeUtils.COLORS.GREEN, bold: true}));
>>>>>>>
if (ProjectContextService.getProjectType() === PROJECT_SUITEAPP) {
let message = TranslationService.getMessage(QUESTIONS.SPECIFIC_APPID,
NodeUtils.formatString(WORDS.SUITE_APP, {color: NodeUtils.COLORS.GREEN, bold: true}));
<<<<<<<
message: `Which ${NodeUtils.formatString("custom objects", {color: NodeUtils.COLORS.GREEN, bold: true})} would you like to include in your list?`,
=======
searchable: true,
message: TranslationService.getMessage(QUESTIONS.FILTER_BY_CUSTOM_OBJECTS,
NodeUtils.formatString(WORDS.OBJECT_TYPES, {color: NodeUtils.COLORS.GREEN, bold: true})),
>>>>>>>
message: TranslationService.getMessage(QUESTIONS.FILTER_BY_CUSTOM_OBJECTS,
NodeUtils.formatString(WORDS.OBJECT_TYPES, {color: NodeUtils.COLORS.GREEN, bold: true})), |
<<<<<<<
const { unwrapExceptionMessage, unwrapInformationMessage } = require('../utils/ExceptionUtils');
=======
const { ActionResult } = require('../commands/actionresult/ActionResult');
const OutputFormatter = require('../commands/outputFormatters/OutputFormatter');
const AuthenticationService = require('../services/AuthenticationService');
>>>>>>>
const { unwrapExceptionMessage, unwrapInformationMessage } = require('../utils/ExceptionUtils');
<<<<<<<
assert(dependencies.executionPath);
=======
assert(dependencies.commandOptionsValidator);
>>>>>>>
<<<<<<<
assert(dependencies.authenticationService);
assert(dependencies.log);
=======
assert(dependencies.consoleLogger);
>>>>>>>
assert(dependencies.log);
<<<<<<<
this._executionPath = dependencies.executionPath;
=======
this._executionPath = dependencies.executionPath ? dependencies.executionPath : process.cwd();
this._commandOptionsValidator = dependencies.commandOptionsValidator;
>>>>>>>
this._executionPath = dependencies.executionPath;
<<<<<<<
this._authenticationService = dependencies.authenticationService;
this._log = dependencies.log;
=======
this._consoleLogger = dependencies.consoleLogger;
>>>>>>>
this._log = dependencies.log;
<<<<<<<
const overriddenArguments = beforeExecutingOutput.arguments;
=======
const overriddenCommandArguments = beforeExecutingOutput.arguments;
const argumentsFromQuestions =
runInInteractiveMode /*|| command._commandMetadata.forceInteractiveMode*/
? await command.getCommandQuestions(inquirer.prompt, commandArguments)
: {};
const commandArgumentsWithQuestionArguments = {
...overriddenCommandArguments,
...argumentsFromQuestions,
};
let commandArgumentsAfterPreActionFunc = command.preActionFunc
? command.preActionFunc(commandArgumentsWithQuestionArguments)
: commandArgumentsWithQuestionArguments;
this._checkCommandValidationErrors(commandArgumentsAfterPreActionFunc, command.commandMetadata, runInInteractiveMode);
>>>>>>>
const overriddenArguments = beforeExecutingOutput.arguments; |
<<<<<<<
OBJECTS_FOLDER: 'Objects',
=======
PACKAGE_REGEX: "^" + PACKAGE_WORD + "(\\." + PACKAGE_WORD + "){2}$",
>>>>>>>
OBJECTS_FOLDER: 'Objects',
PACKAGE_REGEX: "^" + PACKAGE_WORD + "(\\." + PACKAGE_WORD + "){2}$", |
<<<<<<<
NodeUtils.println(this._unwrapExceptionMessage(exception), NodeUtils.COLORS.ERROR);
=======
NodeUtils.println(unwrapExceptionMessage(exception), NodeUtils.COLORS.RED);
>>>>>>>
NodeUtils.println(unwrapExceptionMessage(exception), NodeUtils.COLORS.ERROR);
<<<<<<<
_initializeErrorHandlers() {
const self = this;
Context.EventEmitter.on(CLI_EXCEPTION_EVENT, exception => {
NodeUtils.println(self._unwrapExceptionMessage(exception), NodeUtils.COLORS.ERROR);
});
Context.EventEmitter.on(CLI_FATAL_EXCEPTION_EVENT, exception => {
NodeUtils.println(self._unwrapExceptionMessage(exception), NodeUtils.COLORS.ERROR);
process.exit(1);
});
Context.EventEmitter.on(CLI_DEFAULT_ERROR_EVENT, exception => {
NodeUtils.println(self._unwrapExceptionMessage(exception), NodeUtils.COLORS.ERROR);
});
}
_unwrapExceptionMessage(exception) {
if (exception.getErrorMessage) {
return exception.getErrorMessage();
} else {
return exception;
}
}
=======
>>>>>>> |
<<<<<<<
=======
compoundInfoReceived,
>>>>>>>
<<<<<<<
=======
const getCompoundInfo = (address, currency) => [
'get',
{
payload: {
address,
currency: toLower(currency),
},
scope: ['info'],
},
];
>>>>>>>
<<<<<<<
const { addressSocket } = getState().explorer;
=======
const { addressSocket, compoundSocket } = getState().explorer;
>>>>>>>
const { addressSocket } = getState().explorer;
<<<<<<<
export const explorerInit = () => (dispatch, getState) => {
const { accountAddress, nativeCurrency } = getState().settings;
=======
export const explorerInit = () => (dispatch, getState) => {
const { network, accountAddress, nativeCurrency } = getState().settings;
// Fallback to the testnet data provider
// if we're not on mainnnet
if (network !== networkTypes.mainnet) {
return dispatch(testnetExplorerInit());
}
>>>>>>>
export const explorerInit = () => (dispatch, getState) => {
const { network, accountAddress, nativeCurrency } = getState().settings;
// Fallback to the testnet data provider
// if we're not on mainnnet
if (network !== networkTypes.mainnet) {
return dispatch(testnetExplorerInit());
}
<<<<<<<
=======
const compoundSocket = createSocket('compound');
>>>>>>>
<<<<<<<
payload: addressSocket,
=======
payload: { addressSocket, compoundSocket },
>>>>>>>
payload: addressSocket,
<<<<<<<
};
=======
compoundSocket.on(messages.CONNECT, () => {
dispatch(listenOnCompoundMessages(compoundSocket));
dispatch(refreshCompoundData());
});
};
const refreshCompoundData = () => (dispatch, getState) => {
const fetchCompoundData = () => {
const { compoundSocket } = getState().explorer;
const { accountAddress, nativeCurrency } = getState().settings;
compoundSocket.emit(...getCompoundInfo(accountAddress, nativeCurrency));
};
fetchCompoundData();
clearInterval(getCompoundInterval);
getCompoundInterval = setInterval(fetchCompoundData, 15000); // 15 secs
};
>>>>>>>
};
<<<<<<<
=======
compoundSocket: null,
>>>>>>>
<<<<<<<
addressSocket: action.payload,
=======
addressSocket: action.payload.addressSocket,
compoundSocket: action.payload.compoundSocket,
>>>>>>>
addressSocket: action.payload, |
<<<<<<<
=======
import {
accountLoadState,
settingsInitializeState,
settingsUpdateAccountAddress,
} from '@rainbow-me/rainbow-common';
import analytics from '@segment/analytics-react-native';
>>>>>>>
import analytics from '@segment/analytics-react-native';
<<<<<<<
=======
import * as keychain from './model/keychain';
import { walletInit } from './model/wallet';
>>>>>>>
import * as keychain from './model/keychain';
<<<<<<<
=======
handleInitializeAnalytics = async () => {
let userId = null;
await RNIOS11DeviceCheck.getToken()
.then((deviceId) => {
userId = deviceId;
})
.catch(async (error) => {
const storedUserId = await keychain.loadString('analyticsUserIdentifier');
if (storedUserId) {
userId = storedUserId;
} else {
userId = nanoid();
await keychain.saveString('analyticsUserIdentifier', userId);
}
});
await analytics.setup(REACT_APP_SEGMENT_API_WRITE_KEY, {
ios: {
trackDeepLinks: true,
},
// Record screen views automatically!
recordScreenViews: true,
// Record certain application events automatically!
trackAppLifecycleEvents: true,
trackAttributionData: true,
});
if (userId) {
analytics.identify(userId);
}
}
handleWalletConfig = async (seedPhrase) => {
try {
const { isWalletBrandNew, walletAddress } = await walletInit(seedPhrase);
this.props.settingsUpdateAccountAddress(walletAddress, 'RAINBOWWALLET');
if (isWalletBrandNew) {
return walletAddress;
}
this.props.settingsInitializeState();
this.props.accountLoadState();
this.props.walletConnectInitAllConnectors();
this.props.transactionsToApproveInit();
return walletAddress;
} catch (error) {
Alert.alert('Import failed due to an invalid seed phrase. Please try again.');
return null;
}
}
>>>>>>>
handleInitializeAnalytics = async () => {
let userId = null;
await RNIOS11DeviceCheck.getToken()
.then((deviceId) => {
userId = deviceId;
})
.catch(async (error) => {
const storedUserId = await keychain.loadString('analyticsUserIdentifier');
if (storedUserId) {
userId = storedUserId;
} else {
userId = nanoid();
await keychain.saveString('analyticsUserIdentifier', userId);
}
});
await analytics.setup(REACT_APP_SEGMENT_API_WRITE_KEY, {
ios: {
trackDeepLinks: true,
},
// Record screen views automatically!
recordScreenViews: true,
// Record certain application events automatically!
trackAppLifecycleEvents: true,
trackAttributionData: true,
});
if (userId) {
analytics.identify(userId);
}
} |
<<<<<<<
import { account, accountInitializeState, accountUpdateAccountAddress, commonStorage } from 'balance-common';
import { AppRegistry } from 'react-native';
=======
import { account, commonStorage, accountUpdateAccountAddress } from 'balance-common';
import { AppRegistry, AppState, AsyncStorage, Platform } from 'react-native';
>>>>>>>
import { account, accountInitializeState, accountUpdateAccountAddress, commonStorage } from 'balance-common';
import { AppRegistry, AppState, AsyncStorage, Platform } from 'react-native';
<<<<<<<
import { AlertIOS } from 'react-native';
import Navigation from './navigation';
=======
>>>>>>>
import { AlertIOS } from 'react-native'; |
<<<<<<<
import { Clipboard, View, Text } from 'react-native';
import { compose, withHandlers, withState } from 'recompact';
=======
>>>>>>>
import { View, Text } from 'react-native';
import { compose, withHandlers, withState } from 'recompact';
<<<<<<<
import GraphemeSplitter from 'grapheme-splitter';
=======
import { useNavigation } from 'react-navigation-hooks';
>>>>>>>
import GraphemeSplitter from 'grapheme-splitter';
<<<<<<<
import { margin, colors, borders } from '../../styles';
import { abbreviations } from '../../utils';
import { ButtonPressAnimation } from '../animations';
=======
import { useClipboard } from '../../hooks';
import { borders, margin } from '../../styles';
import { abbreviations, isNewValueForObjectPaths } from '../../utils';
>>>>>>>
import { margin, colors, borders } from '../../styles';
import { abbreviations } from '../../utils';
import { ButtonPressAnimation } from '../animations';
import { useNavigation } from 'react-navigation-hooks';
import { useClipboard } from '../../hooks';
<<<<<<<
accountColor: PropTypes.number,
accountName: PropTypes.string,
emojiCount: PropTypes.number,
onPressAvatar: PropTypes.func,
onPressCopy: PropTypes.func,
onPressReceive: PropTypes.func,
=======
>>>>>>>
accountColor: PropTypes.number,
accountName: PropTypes.string,
<<<<<<<
export default compose(
withState('emojiCount', 'setEmojiCount', 0),
withHandlers({
onPressAvatar: ({ navigation, accountColor, accountName }) => () =>
navigation.navigate('AvatarBuilder', {
accountColor: accountColor,
accountName: accountName,
}),
onPressCopy: ({ accountAddress, emojiCount, setEmojiCount }) => () => {
setEmojiCount(emojiCount + 1);
Clipboard.setString(accountAddress);
},
onPressReceive: ({ navigation }) => () =>
navigation.navigate('ReceiveModal'),
})
)(ProfileMasthead);
=======
const arePropsEqual = (...props) =>
!isNewValueForObjectPaths(...props, ['accountAddress', 'showBottomDivider']);
export default React.memo(ProfileMasthead, arePropsEqual);
>>>>>>>
export default compose(
withState('emojiCount', 'setEmojiCount', 0),
withHandlers({
onPressAvatar: ({ navigation, accountColor, accountName }) => () =>
navigation.navigate('AvatarBuilder', {
accountColor: accountColor,
accountName: accountName,
}),
})
)(ProfileMasthead); |
<<<<<<<
export { default as withWalletConnectConnections } from './withWalletConnectConnections';
export { default as withFabSendAction } from './withFabSendAction';
=======
export { default as withWalletConnectConfirmationModal } from './withWalletConnectConfirmationModal';
export { default as withWalletConnectConnections } from './withWalletConnectConnections';
export { default as withWalletConnectOnSessionRequest } from './withWalletConnectOnSessionRequest';
>>>>>>>
export { default as withWalletConnectConfirmationModal } from './withWalletConnectConfirmationModal';
export { default as withWalletConnectConnections } from './withWalletConnectConnections';
export { default as withFabSendAction } from './withFabSendAction';
export { default as withWalletConnectOnSessionRequest } from './withWalletConnectOnSessionRequest'; |
<<<<<<<
export const signMessage = async (message, authenticationPrompt = lang.t('account.authenticate.please')) => {
try {
const wallet = await loadWallet(authenticationPrompt);
try {
return await wallet.signMessage(message);
} catch(error) {
console.log('signMessage error', error);
AlertIOS.alert(lang.t('wallet.message_signing.failed_signing'));
return null;
}
} catch(error) {
AlertIOS.alert(lang.t('wallet.transaction.alert.authentication'));
return null;
}
};
export const loadSeedPhrase = async () => {
const authenticationPrompt = lang.t('account.authenticate.please_seed_phrase');
=======
export const loadSeedPhrase = async (authenticationPrompt = lang.t('account.authenticate.please_seed_phrase')) => {
>>>>>>>
export const signMessage = async (message, authenticationPrompt = lang.t('account.authenticate.please')) => {
try {
const wallet = await loadWallet(authenticationPrompt);
try {
return await wallet.signMessage(message);
} catch(error) {
console.log('signMessage error', error);
AlertIOS.alert(lang.t('wallet.message_signing.failed_signing'));
return null;
}
} catch(error) {
AlertIOS.alert(lang.t('wallet.transaction.alert.authentication'));
return null;
}
};
export const loadSeedPhrase = async (authenticationPrompt = lang.t('account.authenticate.please_seed_phrase')) => { |
<<<<<<<
walletConnectInitAllConnectors: PropTypes.func,
walletConnectUpdateTimestamp: PropTypes.func,
sortedWalletConnectors: PropTypes.arrayOf(PropTypes.object),
=======
sortedWalletConnectors: PropTypes.arrayOf(PropTypes.object),
>>>>>>>
sortedWalletConnectors: PropTypes.arrayOf(PropTypes.object),
<<<<<<<
AppState.addEventListener('change', this.handleAppStateChange);
=======
Linking.addEventListener('url', this.handleOpenLinkingURL);
>>>>>>>
AppState.addEventListener('change', this.handleAppStateChange);
Linking.addEventListener('url', this.handleOpenLinkingURL);
<<<<<<<
AppState.removeEventListener('change', this.handleAppStateChange);
=======
Linking.removeEventListener('url', this.handleOpenLinkingURL);
>>>>>>>
AppState.removeEventListener('change', this.handleAppStateChange);
Linking.removeEventListener('url', this.handleOpenLinkingURL); |
<<<<<<<
import { signMessage, sendTransaction } from '../model/wallet';
import { estimateGas, getTransactionCount, toHex } from '../handlers/web3';
=======
import {
signMessage,
signPersonalMessage,
sendTransaction,
} from '../model/wallet';
>>>>>>>
import {
signMessage,
signPersonalMessage,
sendTransaction,
} from '../model/wallet';
import { estimateGas, getTransactionCount, toHex } from '../handlers/web3';
<<<<<<<
const message = get(transactionDetails, 'displayDetails.payload');
const flatFormatSignature = await signMessage(message);
=======
const message = get(transactionDetails, 'transactionDisplayDetails.payload');
let flatFormatSignature = null;
if (requestType === 'message') {
flatFormatSignature = await signMessage(message);
} else if (requestType === 'messagePersonal') {
flatFormatSignature = await signPersonalMessage(message);
}
>>>>>>>
const message = get(transactionDetails, 'displayDetails.payload');
let flatFormatSignature = null;
if (requestType === 'message') {
flatFormatSignature = await signMessage(message);
} else if (requestType === 'messagePersonal') {
flatFormatSignature = await signPersonalMessage(message);
} |
<<<<<<<
const Shadow = styled(Highlight)`
background-color: ${({ highlight }) => (highlight ? '#FFFFFF33' : colors.transparent)};
`;
const UniqueTokenCard = ({
=======
const enhance = compose(
shouldUpdate((props, nextProps) => {
const isNewHeight = isNewValueForPath(props, nextProps, 'height');
const isNewUniqueId = isNewValueForPath(props, nextProps, 'uniqueId');
const isNewWidth = isNewValueForPath(props, nextProps, 'height');
return isNewHeight || isNewUniqueId || isNewWidth;
}),
withHandlers({
onPress: ({ item, onPress }) => () => {
if (onPress) {
onPress(item);
}
},
}),
);
const UniqueTokenCard = enhance(({
disabled,
height,
>>>>>>>
const Shadow = styled(Highlight)`
background-color: ${({ highlight }) => (highlight ? '#FFFFFF33' : colors.transparent)};
`;
const enhance = compose(
shouldUpdate((props, nextProps) => {
const isNewHeight = isNewValueForPath(props, nextProps, 'height');
const isNewUniqueId = isNewValueForPath(props, nextProps, 'uniqueId');
const isNewWidth = isNewValueForPath(props, nextProps, 'height');
return isNewHeight || isNewUniqueId || isNewWidth;
}),
withHandlers({
onPress: ({ item, onPress }) => () => {
if (onPress) {
onPress(item);
}
},
}),
);
const UniqueTokenCard = enhance(({
disabled,
height,
<<<<<<<
size,
highlight,
=======
resizeMode,
shadows,
width,
>>>>>>>
size,
highlight,
resizeMode,
shadows,
width,
<<<<<<<
highlight: PropTypes.bool,
=======
disabled: PropTypes.bool,
height: PropTypes.number,
>>>>>>>
disabled: PropTypes.bool,
height: PropTypes.number,
highlight: PropTypes.bool,
<<<<<<<
export default compose(
shouldUpdate((...props) => isNewValueForPath(...props, 'uniqueId')),
withHandlers({
onPress: ({ item, onPress }) => () => {
if (onPress) {
onPress(item);
}
},
}),
withProps(({ item: { uniqueId } }) => ({ uniqueId })),
withFabSendAction,
)(UniqueTokenCard);
=======
UniqueTokenCard.defaultProps = {
shadows: [
[0, 3, 5, colors.black, 0.04],
[0, 6, 10, colors.black, 0.04],
],
};
export default UniqueTokenCard;
>>>>>>>
UniqueTokenCard.defaultProps = {
shadows: [
[0, 3, 5, colors.black, 0.04],
[0, 6, 10, colors.black, 0.04],
],
};
export default compose(
shouldUpdate((...props) => isNewValueForPath(...props, 'uniqueId')),
withHandlers({
onPress: ({ item, onPress }) => () => {
if (onPress) {
onPress(item);
}
},
}),
withProps(({ item: { uniqueId } }) => ({ uniqueId })),
withFabSendAction,
)(UniqueTokenCard); |
<<<<<<<
const tokenFamilyItem = item => <TokenFamilyWrap {...item} />
=======
const collectiblesRenderItem = item => <UniqueTokenItem {...item} assetType="unique_token" />;
const uniswapRenderItem = item => <UniswapCardItem {...item} assetType="uniswap" />;
>>>>>>>
const tokenFamilyItem = item => <TokenFamilyWrap {...item} />
const uniswapRenderItem = item => <UniswapCardItem {...item} assetType="uniswap" />;
<<<<<<<
renderItem: tokenFamilyItem,
=======
name: 'collectibles',
renderItem: collectiblesRenderItem,
>>>>>>>
renderItem: tokenFamilyItem,
name: 'collectibles', |
<<<<<<<
=======
import { withAccountAssets } from '@rainbow-me/rainbow-common';
import analytics from '@segment/analytics-react-native';
>>>>>>>
import analytics from '@segment/analytics-react-native';
<<<<<<<
withUniqueTokens,
=======
withStatusBarStyle,
>>>>>>>
withUniqueTokens,
withStatusBarStyle, |
<<<<<<<
=======
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { AlertIOS, AppRegistry, AppState } from 'react-native';
>>>>>>> |
<<<<<<<
=======
import { distanceInWordsStrict } from 'date-fns';
import { pickBy, values } from 'lodash';
import lang from 'i18n-js';
>>>>>>>
import { pickBy, values } from 'lodash';
<<<<<<<
import {
compose,
hoistStatics,
withHandlers,
} from 'recompact';
import styled from 'styled-components/primitives';
import { colors, padding } from '../../styles';
import { Button } from '../buttons';
=======
import { compose, onlyUpdateForKeys, withHandlers } from 'recompact';
import { withWalletConnectConnections } from '../../hoc';
import { walletConnectDisconnectAll } from '../../model/walletconnect';
import { padding } from '../../styles';
>>>>>>>
import lang from 'i18n-js';
import { compose, withHandlers } from 'recompact';
import { withWalletConnectConnections } from '../../hoc';
import { padding } from '../../styles';
<<<<<<<
dappIcon,
dappUrl,
onPress,
=======
expires,
onPressActionSheet,
>>>>>>>
dappIcon,
dappUrl,
onPressActionSheet,
<<<<<<<
<Container>
<RequestVendorLogoIcon
dappName={dappName}
imageUrl={dappIcon}
size={VendorLogoIconSize}
/>
<Content flex={1}>
<TruncatedText color="dark" size="lmedium">
{dappName}
</TruncatedText>
<ExpiresText>
{dappUrl}
</ExpiresText>
</Content>
<DisconnectButton
bgColor={colors.primaryBlue}
onPress={onPress}
textProps={{ size: 'smedium' }}
=======
<Row align="center" height={WalletConnectListItemHeight}>
<Row
align="center"
component={FlexItem}
flex={1}
css={padding(ContainerPadding, 0, ContainerPadding, ContainerPadding)}
>>>>>>>
<Row align="center" height={WalletConnectListItemHeight}>
<Row
align="center"
component={FlexItem}
flex={1}
css={padding(ContainerPadding, 0, ContainerPadding, ContainerPadding)}
<<<<<<<
dappIcon: PropTypes.string.isRequired,
dappUrl: PropTypes.string.isRequired,
onPress: PropTypes.func.isRequired,
=======
expires: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
onPressActionSheet: PropTypes.func.isRequired,
>>>>>>>
dappIcon: PropTypes.string.isRequired,
dappUrl: PropTypes.string.isRequired,
onPressActionSheet: PropTypes.func.isRequired,
<<<<<<<
export default hoistStatics(compose(
withHandlers({ onPress: ({ onPress, dappName }) => () => onPress(dappName) }),
))(WalletConnectListItem);
=======
export default WalletConnectListItem;
>>>>>>>
export default WalletConnectListItem; |
<<<<<<<
this.props.dataAddNewTransaction(txDetails);
this.props.removeRequest(transactionDetails.requestId);
try {
await this.props.walletConnectSendStatus(transactionDetails.peerId, transactionDetails.requestId, transactionHash);
} catch (error) {
}
=======
this.props.transactionsAddNewTransaction(txDetails);
this.props.removeTransaction(transactionDetails.requestId);
await this.props.walletConnectSendStatus(transactionDetails.peerId, transactionDetails.requestId, transactionHash);
analytics.track('Approved WalletConnect transaction request');
>>>>>>>
this.props.dataAddNewTransaction(txDetails);
this.props.removeRequest(transactionDetails.requestId);
try {
await this.props.walletConnectSendStatus(transactionDetails.peerId, transactionDetails.requestId, transactionHash);
} catch (error) {
}
analytics.track('Approved WalletConnect transaction request');
<<<<<<<
this.props.removeRequest(transactionDetails.requestId);
=======
const { requestId, transactionDisplayDetails: { requestType } } = transactionDetails;
this.props.removeTransaction(requestId);
const rejectionType = requestType === 'message' ? 'signature' : 'transaction';
analytics.track(`Rejected WalletConnect ${rejectionType} request`);
>>>>>>>
const { requestId, displayDetails: { requestType } } = transactionDetails;
this.props.removeRequest(requestId);
const rejectionType = requestType === 'message' ? 'signature' : 'transaction';
analytics.track(`Rejected WalletConnect ${rejectionType} request`); |
<<<<<<<
=======
export { default as withActionSheetManager } from './withActionSheetManager';
export { default as withAddWalletConnector } from './withAddWalletConnector';
export { default as withAppState } from './withAppState';
>>>>>>>
export { default as withActionSheetManager } from './withActionSheetManager';
export { default as withAppState } from './withAppState'; |
<<<<<<<
import { InteractionManager } from 'react-native';
import { compose, onlyUpdateForKeys, withHandlers } from 'recompact';
import { useAccountAssets } from '../../hooks';
=======
import { compose, onlyUpdateForKeys, withHandlers, withProps } from 'recompact';
import { withAccountData, withAccountSettings } from '../../hoc';
>>>>>>>
import { compose, onlyUpdateForKeys, withHandlers } from 'recompact';
import { useAccountAssets } from '../../hooks'; |
<<<<<<<
hideBiometricIcon={isUnlockingAsset}
hideInnerBorder
=======
>>>>>>>
hideInnerBorder |
<<<<<<<
import {
compose, shouldUpdate, withHandlers, withProps,
} from 'recompact';
import connect from 'react-redux/es/connect/connect';
=======
import stylePropType from 'react-style-proptype';
import { compose, onlyUpdateForKeys, withHandlers } from 'recompact';
>>>>>>>
import stylePropType from 'react-style-proptype';
import {
compose, withHandlers, withProps, shouldUpdate
} from 'recompact';
<<<<<<<
const Container = styled(Centered)`
${position.cover};
background-color: ${({ backgroundColor }) => backgroundColor};
border-radius: ${UniqueTokenCardBorderRadius};
`;
const Shadow = styled(Highlight)`
background-color: ${({ highlight }) => (highlight ? '#FFFFFF33' : colors.transparent)};
`;
=======
const enhance = compose(
onlyUpdateForKeys(['height', 'style', 'uniqueId', 'width']),
withHandlers({
onPress: ({ item, onPress }) => () => {
if (onPress) {
onPress(item);
}
},
}),
);
>>>>>>>
const Shadow = styled(Highlight)`
background-color: ${({ highlight }) => (highlight ? '#FFFFFF33' : colors.transparent)};
`;
<<<<<<<
</Container>
<Shadow highlight={highlight}/>
=======
</Centered>
>>>>>>>
<Shadow highlight={highlight}/>
</Centered>
<<<<<<<
size: PropTypes.number,
=======
style: stylePropType,
>>>>>>>
size: PropTypes.number,
style: stylePropType, |
<<<<<<<
/**
* @todo
*/
=======
>>>>>>>
/**
* @todo
*/
<<<<<<<
/**
* @todo
*/
=======
>>>>>>>
/**
* @todo
*/
<<<<<<<
/**
* @todo
*/
obj.getTweets = function(query, lang, max_id, result_type){
=======
obj.getTweets = function(query, max_id, result_type, lang){
if (!lang || lang == '')
{
return apiCall('GET', '/1.1/search/tweets.json', {q: query, max_id: max_id, result_type: result_type, count: 100, include_entities: 1},
"Twitter was unable to retrieve mentions of this user, is there a typo?");
}
>>>>>>>
/**
* @todo
*/
obj.getTweets = function(query, max_id, result_type, lang){
if (!lang || lang == '')
{ |
<<<<<<<
import { colors } from '../../styles';
=======
import { colors, fonts } from '../../styles';
import { isNewValueForObjectPaths } from '../../utils';
>>>>>>>
import { colors, fonts } from '../../styles';
<<<<<<<
return (
<ColumnWithMargins
backgroundColor={colors.white}
flex={0}
margin={12}
paddingTop={16}
width="100%"
zIndex={1}
>
<Row align="center">
<TouchableWithoutFeedback onPress={handleFocusInputField}>
<RowWithMargins
align="center"
flex={1}
margin={10}
paddingLeft={padding}
>
<CoinIcon
bgColor={inputCurrencySymbol ? undefined : skeletonColor}
flex={0}
size={40}
symbol={inputCurrencySymbol}
address={inputCurrencyAddress}
/>
<ExchangeInput
editable={!!inputCurrencySymbol}
onChangeText={setInputAmount}
onBlur={onBlur}
onFocus={onFocus}
placeholder={inputCurrencySymbol ? '0' : EnDash.unicode}
placeholderTextColor={
inputCurrencySymbol ? undefined : skeletonColor
}
refInput={handleInputFieldRef}
value={inputAmount}
/>
</RowWithMargins>
</TouchableWithoutFeedback>
{!disableInputCurrencySelection && (
=======
render = () => {
const {
inputAmount,
inputCurrencyAddress,
inputCurrencySymbol,
isAssetApproved,
nativeAmount,
nativeCurrency,
nativeFieldRef,
onBlur,
onFocus,
onPressMaxBalance,
onPressSelectInputCurrency,
setInputAmount,
setNativeAmount,
} = this.props;
const skeletonColor = colors.alpha(colors.blueGreyDark, 0.1);
return (
<ColumnWithMargins
backgroundColor={colors.white}
flex={0}
margin={12}
paddingTop={16}
width="100%"
zIndex={1}
>
<Row align="center">
<TouchableWithoutFeedback onPress={this.handleFocusInputField}>
<RowWithMargins
align="center"
flex={1}
margin={10}
paddingLeft={this.padding}
>
<CoinIcon
bgColor={inputCurrencySymbol ? undefined : skeletonColor}
flex={0}
size={40}
symbol={inputCurrencySymbol}
address={inputCurrencyAddress}
/>
<ExchangeInput
disableTabularNums
editable={!!inputCurrencySymbol}
fontFamily={fonts.family.SFProRounded}
letterSpacing={fonts.letterSpacing.roundedTightest}
onChangeText={setInputAmount}
onBlur={onBlur}
onFocus={onFocus}
placeholder={inputCurrencySymbol ? '0' : EnDash.unicode}
placeholderTextColor={
inputCurrencySymbol ? undefined : skeletonColor
}
refInput={this.handleInputFieldRef}
value={inputAmount}
/>
</RowWithMargins>
</TouchableWithoutFeedback>
>>>>>>>
return (
<ColumnWithMargins
backgroundColor={colors.white}
flex={0}
margin={12}
paddingTop={16}
width="100%"
zIndex={1}
>
<Row align="center">
<TouchableWithoutFeedback onPress={handleFocusInputField}>
<RowWithMargins
align="center"
flex={1}
margin={10}
paddingLeft={padding}
>
<CoinIcon
bgColor={inputCurrencySymbol ? undefined : skeletonColor}
flex={0}
size={40}
symbol={inputCurrencySymbol}
address={inputCurrencyAddress}
/>
<ExchangeInput
disableTabularNums
editable={!!inputCurrencySymbol}
fontFamily={fonts.family.SFProRounded}
letterSpacing={fonts.letterSpacing.roundedTightest}
onChangeText={setInputAmount}
onBlur={onBlur}
onFocus={onFocus}
placeholder={inputCurrencySymbol ? '0' : EnDash.unicode}
placeholderTextColor={
inputCurrencySymbol ? undefined : skeletonColor
}
refInput={handleInputFieldRef}
value={inputAmount}
/>
</RowWithMargins>
</TouchableWithoutFeedback>
{!disableInputCurrencySelection && ( |
<<<<<<<
...(isNativeStackAvailable
? {}
: {
OverlayExpandedAssetScreen: {
navigationOptions: overlayExpandedPreset,
screen: ExpandedAssetScreenWithData,
},
}),
=======
>>>>>>>
...(isNativeStackAvailable
? {}
: {
OverlayExpandedAssetScreen: {
navigationOptions: overlayExpandedPreset,
screen: ExpandedAssetScreenWithData,
},
}),
<<<<<<<
onTransitionStart: () => {
StatusBar.setBarStyle('light-content');
=======
onTransitionStart: () => {
onTransitionStart();
>>>>>>>
onTransitionStart: () => {
StatusBar.setBarStyle('light-content');
onTransitionStart(); |
<<<<<<<
=======
import {
accountLoadState,
settingsInitializeState,
settingsUpdateAccountAddress,
} from '@rainbow-me/rainbow-common';
>>>>>>>
<<<<<<<
await this.props.initializeWallet();
=======
await this.handleWalletConfig();
await this.props.refreshAccount();
await this.handleInitializeAnalytics();
>>>>>>>
await this.props.initializeWallet();
await this.handleInitializeAnalytics(); |
<<<<<<<
export { default as useAccountData } from './useAccountData';
=======
export { default as useAccountAssets } from './useAccountAssets';
export { default as useAccountSettings } from './useAccountSettings';
>>>>>>>
export { default as useAccountData } from './useAccountData';
export { default as useAccountAssets } from './useAccountAssets';
export { default as useAccountSettings } from './useAccountSettings';
<<<<<<<
export { default as useDimensions } from './useDimensions';
export { default as useEmailRainbow } from './useEmailRainbow';
=======
export { default as useGas } from './useGas';
export { default as useHideSplashScreen } from './useHideSplashScreen';
export { default as useInitializeAccountData } from './useInitializeAccountData';
export { default as useInitializeWallet } from './useInitializeWallet';
>>>>>>>
export { default as useDimensions } from './useDimensions';
export { default as useEmailRainbow } from './useEmailRainbow';
export { default as useGas } from './useGas';
export { default as useHideSplashScreen } from './useHideSplashScreen';
export { default as useInitializeAccountData } from './useInitializeAccountData';
export { default as useInitializeWallet } from './useInitializeWallet';
<<<<<<<
export { default as useInterval } from './useInterval';
=======
export { default as useLoadAccountData } from './useLoadAccountData';
export { default as useMagicFocus } from './useMagicFocus';
>>>>>>>
export { default as useInterval } from './useInterval';
export { default as useLoadAccountData } from './useLoadAccountData';
export { default as useMagicFocus } from './useMagicFocus';
<<<<<<<
export { default as useShakeAnimation } from './useShakeAnimation';
export { default as useTimeout } from './useTimeout';
export { default as useTransformOrigin } from './useTransformOrigin';
export { default as useWyreApplePay } from './useWyreApplePay';
=======
export { default as useRefreshAccountData } from './useRefreshAccountData';
export { default as useSavingsAccount } from './useSavingsAccount';
export { default as useSendableUniqueTokens } from './useSendableUniqueTokens';
export { default as useTransformOrigin } from './useTransformOrigin';
export { default as useUniswapAllowances } from './useUniswapAllowances';
export { default as useUniswapAssets } from './useUniswapAssets';
export { default as useUniswapAssetsInWallet } from './useUniswapAssetsInWallet';
export { default as useWalletSectionsData } from './useWalletSectionsData';
>>>>>>>
export { default as useRefreshAccountData } from './useRefreshAccountData';
export { default as useSavingsAccount } from './useSavingsAccount';
export { default as useSendableUniqueTokens } from './useSendableUniqueTokens';
export { default as useShakeAnimation } from './useShakeAnimation';
export { default as useTimeout } from './useTimeout';
export { default as useTransformOrigin } from './useTransformOrigin';
export { default as useUniswapAllowances } from './useUniswapAllowances';
export { default as useUniswapAssets } from './useUniswapAssets';
export { default as useUniswapAssetsInWallet } from './useUniswapAssetsInWallet';
export { default as useWalletSectionsData } from './useWalletSectionsData';
export { default as useWyreApplePay } from './useWyreApplePay'; |
<<<<<<<
const seedPhraseKey = 'seedPhrase';
const privateKeyKey = 'privateKey';
const addressKey = 'addressKey';
import { ACCESS_CONTROL, ACCESSIBLE } from 'react-native-keychain';
=======
const seedPhraseKey = 'balanceWalletSeedPhrase';
const privateKeyKey = 'balanceWalletPrivateKey';
const addressKey = 'balanceWalletAddressKey';
>>>>>>>
const seedPhraseKey = 'balanceWalletSeedPhrase';
const privateKeyKey = 'balanceWalletPrivateKey';
const addressKey = 'balanceWalletAddressKey';
import { ACCESS_CONTROL, ACCESSIBLE } from 'react-native-keychain';
<<<<<<<
console.log('create wallet');
seedPhrase = seedPhrase || generateSeedPhrase();
const wallet = ethers.Wallet.fromMnemonic(seedPhrase);
=======
const walletSeedPhrase = seedPhrase || generateSeedPhrase();
const wallet = ethers.Wallet.fromMnemonic(walletSeedPhrase);
>>>>>>>
const walletSeedPhrase = seedPhrase || generateSeedPhrase();
const wallet = ethers.Wallet.fromMnemonic(walletSeedPhrase); |
<<<<<<<
duration: 170,
=======
duration: 160,
easing: Easing.bezier(0.25, 0.46, 0.45, 0.94),
>>>>>>>
duration: 160, |
<<<<<<<
await walletConnectSendTransactionHash(walletConnector, transactionDetails.transactionId, true, transactionHash);
=======
await walletConnectSendTransactionHash(walletConnector, transactionDetails.callId, true, transactionReceipt.hash);
>>>>>>>
await walletConnectSendTransactionHash(walletConnector, transactionDetails.callId, true, transactionHash); |
<<<<<<<
const AssetListHeader = ({ section: { contextMenuOptions, title, totalValue } }) => (
=======
const AssetListHeader = ({
section: {
showContextMenu,
title,
totalValue,
},
}) => (
>>>>>>>
const AssetListHeader = ({
section: {
contextMenuOptions,
title,
totalValue,
},
}) => ( |
<<<<<<<
export { default as Bold } from './Bold';
=======
export { default as Label } from './Label';
>>>>>>>
export { default as Bold } from './Bold';
export { default as Label } from './Label'; |
<<<<<<<
function createElement(type, props, ...children) {
const copiedChildren = children.flat(Infinity);
return {
=======
const createElement = (type, props, ...children) => {
const inputChildren = [];
children.forEach((child) => {
if (child === undefined || child === null) {
throw new TypeError("text have not to be a null or undefined.");
}
if (typeof child !== "object") {
inputChildren.push(createTextElement(child));
return;
}
if (child && child.length) {
child.forEach((child) => inputChildren.push(child));
return;
}
inputChildren.push(child);
});
const element = {
>>>>>>>
const createElement = (type, props, ...children) => {
const copiedChildren = children.flat(Infinity);
return {
<<<<<<<
}
=======
if (typeof type !== "function") {
element.ELEMENT_ID = ELEMENT_ID++;
}
return element;
};
>>>>>>>
}
<<<<<<<
if (vNode.type == "TEXT_NODE") {
break;
}
let vChild = null;
if (children && children[index] !== undefined) {
vChild = { ...children[index] };
=======
if (vNode.type == "TEXT_NODE") {
break;
}
let vChild;
if (children && children[index] !== undefined) {
vChild = { ...children[index] };
console.log(vChild);
}
if (vChild) {
>>>>>>>
if (vNode.type == "TEXT_NODE") {
break;
}
let vChild = null;
if (children && children[index] !== undefined) {
vChild = { ...children[index] };
<<<<<<<
debugger;
appendVNode(vNode, vNode.props.children);
=======
appendVNode(vNode, vNode.props && vNode.props.children);
>>>>>>>
appendVNode(vNode, vNode.props && vNode.props.children); |
<<<<<<<
removePurchaseTransactions,
=======
removeSavings,
>>>>>>>
removePurchaseTransactions,
removeSavings,
<<<<<<<
const DATA_UPDATE_COMPOUND_ASSETS = 'data/DATA_UPDATE_COMPOUND_ASSETS';
const DATA_UPDATE_PURCHASE_TRANSACTIONS =
'data/DATA_UPDATE_PURCHASE_TRANSACTIONS';
=======
>>>>>>>
const DATA_UPDATE_PURCHASE_TRANSACTIONS =
'data/DATA_UPDATE_PURCHASE_TRANSACTIONS';
<<<<<<<
const finalizeStatus = status => {
switch (status) {
case TransactionStatusTypes.sending:
return TransactionStatusTypes.sent;
case TransactionStatusTypes.receiving:
return TransactionStatusTypes.received;
case TransactionStatusTypes.purchasing:
return TransactionStatusTypes.purchased;
default:
return TransactionStatusTypes.sent;
}
};
=======
const getConfirmedState = type => {
switch (type) {
case TransactionTypes.authorize:
return TransactionStatusTypes.approved;
case TransactionTypes.deposit:
return TransactionStatusTypes.deposited;
case TransactionTypes.withdraw:
return TransactionStatusTypes.withdrew;
case TransactionTypes.receive:
return TransactionStatusTypes.received;
default:
return TransactionStatusTypes.sent;
}
};
>>>>>>>
const getConfirmedState = type => {
switch (type) {
case TransactionTypes.authorize:
return TransactionStatusTypes.approved;
case TransactionTypes.deposit:
return TransactionStatusTypes.deposited;
case TransactionTypes.withdraw:
return TransactionStatusTypes.withdrew;
case TransactionTypes.receive:
return TransactionStatusTypes.received;
case TransactionTypes.purchase:
return TransactionStatusTypes.purchased;
default:
return TransactionStatusTypes.sent;
}
};
<<<<<<<
updatedTransactions[index].status = finalizeStatus(
updatedTransactions[index].status
);
=======
if (!isZero(txObj.status)) {
updatedTransactions[index].status = getConfirmedState(
updatedTransactions[index].type
);
} else {
updatedTransactions[index].status = TransactionStatusTypes.failed;
}
>>>>>>>
if (!isZero(txObj.status)) {
updatedTransactions[index].status = getConfirmedState(
updatedTransactions[index].type
);
} else {
updatedTransactions[index].status = TransactionStatusTypes.failed;
} |
<<<<<<<
import { calculateKeyboardHeight } from '../../helpers/keyboardHeight';
=======
>>>>>>>
import { calculateKeyboardHeight } from '../../helpers/keyboardHeight';
<<<<<<<
export const sheetVerticalOffset = statusBarHeight;
export let swapDetailsTransitionPosition = new Animated.Value(0);
=======
export const sheetVerticalOffset = statusBarHeight;
>>>>>>>
export const sheetVerticalOffset = statusBarHeight;
export let swapDetailsTransitionPosition = new Animated.Value(0);
<<<<<<<
const swapDetailInterpolator = ({
current: { progress: current },
layouts: { screen },
}) => {
// kinda hacky... but lets me expose the
// stack's transitionPosition in an exportable wayy
Animated.spring(swapDetailsTransitionPosition, {
toValue: current,
useNativeDriver: true,
}).start();
const backgroundOpacity = current.interpolate({
inputRange: [-1, 0, 0.975, 2],
outputRange: [0, 0, 0.7, 0.7],
});
const translateY = current.interpolate({
inputRange: [0, 1],
outputRange: [screen.height, 0],
});
return {
cardStyle: {
// Translation for the animation of the current card
transform: [{ translateY }],
},
overlayStyle: {
backgroundColor: 'rgb(37, 41, 46)',
borderBottomWidth: calculateKeyboardHeight(deviceUtils.dimensions.height),
borderColor: colors.blueGreyDarker,
opacity: backgroundOpacity,
overflow: 'hidden',
shadowColor: colors.dark,
shadowOffset: { height: 10, width: 0 },
shadowOpacity: 0.6,
shadowRadius: 25,
},
};
};
=======
>>>>>>>
const swapDetailInterpolator = ({
current: { progress: current },
layouts: { screen },
}) => {
// kinda hacky... but lets me expose the
// stack's transitionPosition in an exportable wayy
Animated.spring(swapDetailsTransitionPosition, {
toValue: current,
useNativeDriver: true,
}).start();
const backgroundOpacity = current.interpolate({
inputRange: [-1, 0, 0.975, 2],
outputRange: [0, 0, 0.7, 0.7],
});
const translateY = current.interpolate({
inputRange: [0, 1],
outputRange: [screen.height, 0],
});
return {
cardStyle: {
// Translation for the animation of the current card
transform: [{ translateY }],
},
overlayStyle: {
backgroundColor: 'rgb(37, 41, 46)',
borderBottomWidth: calculateKeyboardHeight(deviceUtils.dimensions.height),
borderColor: colors.blueGreyDarker,
opacity: backgroundOpacity,
overflow: 'hidden',
shadowColor: colors.dark,
shadowOffset: { height: 10, width: 0 },
shadowOpacity: 0.6,
shadowRadius: 25,
},
};
};
<<<<<<<
cardStyleInterpolator: expandStyleInterpolator(0.4),
=======
cardStyleInterpolator: exchangeDetailsStyleInterpolator,
>>>>>>>
cardStyleInterpolator: exchangeDetailsStyleInterpolator,
<<<<<<<
cardStyleInterpolator: savingsStyleInterpolator,
=======
cardStyleInterpolator: expandStyleInterpolator(0.4),
>>>>>>>
cardStyleInterpolator: savingsStyleInterpolator,
<<<<<<<
};
export const swapDetailsPreset = {
cardShadowEnabled: true,
cardStyle: { backgroundColor: 'transparent' },
cardStyleInterpolator: swapDetailInterpolator,
cardTransparent: true,
gestureDirection: 'vertical',
gestureResponseDistance,
transitionSpec: { close: closeSpec, open: openSpec },
=======
>>>>>>>
};
export const swapDetailsPreset = {
cardShadowEnabled: true,
cardStyle: { backgroundColor: 'transparent' },
cardStyleInterpolator: swapDetailInterpolator,
cardTransparent: true,
gestureDirection: 'vertical',
gestureResponseDistance,
transitionSpec: { close: closeSpec, open: openSpec }, |
<<<<<<<
let isImported = false;
let isNew = false;
if (seedPhrase) {
=======
let isWalletBrandNew = false;
if (!isEmpty(seedPhrase)) {
>>>>>>>
let isImported = false;
let isNew = false;
if (!isEmpty(seedPhrase)) {
<<<<<<<
isImported = true;
}
if (!walletAddress) {
walletAddress = await loadAddress();
=======
isWalletBrandNew = !isNil(walletAddress);
return { isWalletBrandNew, walletAddress };
>>>>>>>
isImported = !isNil(walletAddress);
return { isImported, isNew, walletAddress };
<<<<<<<
const createWallet = async (seed) => {
// TODO better error handling
const walletSeed = seed || generateSeedPhrase();
let wallet = null;
if (isHexStringIgnorePrefix(walletSeed)
&& addHexPrefix(walletSeed).length === 66) {
wallet = new ethers.Wallet(walletSeed);
} else if (isValidMnemonic(walletSeed)) {
wallet = ethers.Wallet.fromMnemonic(walletSeed);
} else {
let hdnode = ethers.utils.HDNode.fromSeed(walletSeed);
let node = hdnode.derivePath("m/44'/60'/0'/0/0");
wallet = new ethers.Wallet(node.privateKey);
}
if (wallet) {
saveWalletDetails(walletSeed, wallet.privateKey, wallet.address);
return wallet.address;
}
return null;
=======
const createWallet = async (seedPhrase) => {
const walletSeedPhrase = seedPhrase || generateSeedPhrase();
try {
const wallet = ethers.Wallet.fromMnemonic(walletSeedPhrase);
saveWalletDetails(walletSeedPhrase, wallet.privateKey, wallet.address);
return wallet.address;
} catch (error) {
return null;
}
>>>>>>>
const createWallet = async (seed) => {
const walletSeed = seed || generateSeedPhrase();
let wallet = null;
try {
if (isHexStringIgnorePrefix(walletSeed)
&& addHexPrefix(walletSeed).length === 66) {
wallet = new ethers.Wallet(walletSeed);
} else if (isValidMnemonic(walletSeed)) {
wallet = ethers.Wallet.fromMnemonic(walletSeed);
} else {
let hdnode = ethers.utils.HDNode.fromSeed(walletSeed);
let node = hdnode.derivePath("m/44'/60'/0'/0/0");
wallet = new ethers.Wallet(node.privateKey);
}
if (wallet) {
saveWalletDetails(walletSeed, wallet.privateKey, wallet.address);
return wallet.address;
}
return null;
} catch (error) {
return null;
} |
<<<<<<<
import { parseTransactions } from '../parsers/transactions';
import { loweredTokenOverridesFallback } from '../references';
=======
import parseTransactions from '../parsers/transactions';
import {
loweredTokenOverridesFallback,
shitcoinBlacklist,
} from '../references';
>>>>>>>
import { parseTransactions } from '../parsers/transactions';
import {
loweredTokenOverridesFallback,
shitcoinBlacklist,
} from '../references';
<<<<<<<
export const dataAddNewTransaction = (txDetails, disableTxnWatcher = false) => (
dispatch,
getState
) =>
=======
export const dataAddNewTransaction = (txDetails, disableTxnWatcher) => (
dispatch,
getState
) =>
>>>>>>>
export const dataAddNewTransaction = (txDetails, disableTxnWatcher = false) => (
dispatch,
getState
) => |
<<<<<<<
const CollectiblesRenderItem = ({
item: { onSelectAsset, ...item },
}) => (
<CollectiblesSendRow
data={item}
onPress={onSelectAsset(item)}
/>
);
// TODO onSelectAsset should not rely on symbol
const BalancesRenderItem = ({
index,
item: { onSelectAsset, symbol, ...item },
}) => (
=======
const BalancesRenderItem = ({ item: { onSelectAsset, symbol, ...item } }) => (
>>>>>>>
const CollectiblesRenderItem = ({ item: { onSelectAsset, ...item } }) => (
<CollectiblesSendRow
item={item}
onPress={onSelectAsset(item)}
/>
);
const BalancesRenderItem = ({ item: { onSelectAsset, symbol, ...item } }) => (
<<<<<<<
CollectiblesRenderItem.propTypes = {
item: PropTypes.shape({
onSelectAsset: PropTypes.func
}),
};
=======
>>>>>>>
CollectiblesRenderItem.propTypes = {
item: PropTypes.shape({
onSelectAsset: PropTypes.func
}),
}; |
<<<<<<<
=======
import networkTypes from '../helpers/networkTypes';
>>>>>>>
import networkTypes from '../helpers/networkTypes';
<<<<<<<
=======
const UNISWAP_UPDATE_PENDING_APPROVALS =
'uniswap/UNISWAP_UPDATE_PENDING_APPROVALS';
>>>>>>>
<<<<<<<
=======
const extractTransactionHash = txn => toLower(txn.hash).split('-')[0];
const firstItem = value => get(value, '[0]');
>>>>>>>
<<<<<<<
=======
const pendingApprovals = await getUniswapPendingApprovals(
accountAddress,
network
);
>>>>>>>
<<<<<<<
=======
pendingApprovals,
>>>>>>>
<<<<<<<
const pairs = await getUniswapPairs(tokenOverrides);
dispatch({
payload: pairs,
type: UNISWAP_UPDATE_PAIRS,
});
=======
const { network } = getState().settings;
const pairs =
network === networkTypes.mainnet
? await getUniswapPairs(tokenOverrides)
: await getTestnetUniswapPairs(network);
dispatch({
payload: pairs,
type: UNISWAP_UPDATE_PAIRS,
});
>>>>>>>
const { network } = getState().settings;
const pairs =
network === networkTypes.mainnet
? await getUniswapPairs(tokenOverrides)
: await getTestnetUniswapPairs(network);
dispatch({
payload: pairs,
type: UNISWAP_UPDATE_PAIRS,
});
<<<<<<<
=======
pendingApprovals: {},
>>>>>>>
<<<<<<<
=======
draft.pendingApprovals = action.payload.pendingApprovals;
>>>>>>> |
<<<<<<<
import { ButtonPressAnimation } from '../animations';
import CopyTooltip from '../CopyTooltip';
=======
import CopyTooltip from '../copy-tooltip';
>>>>>>>
import { ButtonPressAnimation } from '../animations';
import CopyTooltip from '../copy-tooltip'; |
<<<<<<<
export const nativeTransactionListAvailable = true;
export const nativeButtonPressAnimationAvailable = false;
=======
export const nativeTransactionListAvailable = false;
export const nativeButtonPressAnimationAvailable = true;
>>>>>>>
export const nativeTransactionListAvailable = true;
export const nativeButtonPressAnimationAvailable = true; |
<<<<<<<
<html lang=en>
<head>
<meta charset=utf-8>
<meta http-equiv=X-UA-Compatible content="IE=edge">
<meta name=viewport content="width=device-width,initial-scale=1">
<link rel=icon href=/favicon.ico> <title>ESPDash</title>
<script data-name="BMC-Widget" async src="https://cdnjs.buymeacoffee.com/1.0.0/widget.prod.min.js" data-id="6QGVpSj" data-description="Support me on Buy me a coffee!" data-message="You can always support my work by buying me a coffee!" data-color="#FF813F" data-position="right" data-x_margin="24" data-y_margin="24"></script>
</head>
<body style="overflow: hidden;">
=======
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="referrer" content="no-referrer">
<meta name="robots" content="noindex">
<title>ESP-DASH</title>
</head>
<body>
>>>>>>>
<html lang=en>
<head>
<meta charset=utf-8>
<meta http-equiv=X-UA-Compatible content="IE=edge">
<meta name=viewport content="width=device-width,initial-scale=1">
<link rel=icon href=/favicon.ico> <title>ESPDash</title>
<script data-name="BMC-Widget" async src="https://cdnjs.buymeacoffee.com/1.0.0/widget.prod.min.js" data-id="6QGVpSj" data-description="Support me on Buy me a coffee!" data-message="You can always support my work by buying me a coffee!" data-color="#FF813F" data-position="right" data-x_margin="24" data-y_margin="24"></script>
</head>
<body> |
<<<<<<<
// Only register content nodes
if (_.include(types, "content")) {
if (options.target === "front") {
var pos = 0;
} else if (!options.target || options.target === "back") {
var pos = doc.lists["content"].length;
} else {
var pos = doc.lists["content"].indexOf(options.target)+1;
}
insertAt("content", id, pos);
}
},
=======
var defaults = {
refs: {
"master" : {
"head" : ""
}
},
commits: {}
};
>>>>>>>
// Only register content nodes
if (_.include(types, "content")) {
if (options.target === "front") {
var pos = 0;
} else if (!options.target || options.target === "back") {
var pos = doc.lists["content"].length;
} else {
var pos = doc.lists["content"].indexOf(options.target)+1;
}
insertAt("content", id, pos);
}
},
<<<<<<<
if (!node) throw('node ' +options.id+ ' not found.');
=======
// Checkout head (of master branch)
this.checkout('master', 'head');
};
>>>>>>>
if (!node) throw('node ' +options.id+ ' not found.');
<<<<<<<
this.checkout = function(ref) {
=======
checkout: function(branch, ref) {
>>>>>>>
this.checkout = function(branch, ref) {
<<<<<<<
// --------
this.getRef = function(ref) {
return this.model.refs[ref];
};
=======
getRef: function(ref) {
return this.model.refs['master'][ref];
},
>>>>>>>
// --------
this.getRef = function(ref) {
return this.model.refs['master'][ref];
};
<<<<<<<
this.undo = function() {
var ref = this.getRef(this.head) || this.head;
var commit = this.model.commits[ref];
=======
undo: function() {
var headRef = this.getRef(this.head) || this.head;
var commit = this.model.commits[headRef];
>>>>>>>
this.undo = function() {
var headRef = this.getRef(this.head) || this.head;
var commit = this.model.commits[headRef];
<<<<<<<
this.redo = function() {
var commits = this.commits('tail');
=======
redo: function() {
// var commit = this.commits('tail', this.head)[0];
var commits = this.commits('last');
>>>>>>>
this.redo = function() {
var commits = this.commits('last');
<<<<<<<
};
=======
},
// Get ref
getRef: function(ref) {
return this.model.refs['master'][ref];
},
// Set ref to a particular commit
setRef: function(ref, sha, silent) {
this.model.refs['master'][ref] = sha;
if (!silent) this.trigger('ref:updated', ref, sha);
},
// Create a commit for a certain operation
commit: function(op) {
var commit = {
op: op,
sha: Math.uuid(),
parent: this.head
};
this.model.commits[commit.sha] = commit;
this.setRef('head', commit.sha, true);
this.setRef('last', commit.sha, true);
return commit;
}
});
// Helper Dudes
// --------
Document.helpers = {
annotations: function(node) {
var annotations = {};
_.each(this.content.annotations, function(a) {
if (a.node === node) annotations[a.id] = a;
});
return annotations;
},
>>>>>>>
};
<<<<<<<
=======
newNode.prev = null;
doc.head = newNode.id;
} else if (!options.target || options.target === "back") {
// This goes to the back
var tailNode = doc.nodes[doc.tail];
if (tailNode) {
tailNode.next = newNode.id;
newNode.prev = tailNode.id;
} else { // Empty doc
doc.head = newNode.id;
newNode.prev = null;
}
newNode.next = null;
doc.tail = newNode.id;
} else {
// This goes after the target node
var t = doc.nodes[options.target]; // Target
var tn = doc.nodes[doc.nodes[options.target].next]; // Target-next
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.