conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
</FiatConverterInput>
{renderErrorsAndLimits()}
=======
</FiatConvertorInput>
>>>>>>>
</FiatConverterInput> |
<<<<<<<
swapGetStarted: swapGetStarted({ coreSagas }),
transactionReport: transactionReport({ api, coreSagas }),
=======
transactionReport: transactionReport({ coreSagas }),
>>>>>>>
swapGetStarted: swapGetStarted({ coreSagas }),
transactionReport: transactionReport({ coreSagas }), |
<<<<<<<
const TourTooltipComponent = ({
analyticsActions,
index,
isLastStep,
primaryProps,
skipProps,
step,
tooltipProps,
...rest
}) => {
useEffect(() => {
switch (index) {
case 0:
analyticsActions.logEvent(GENERAL_EVENTS.WALLET_INTRO_PORTFOLIO_VIEWED)
break
case 1:
analyticsActions.logEvent(GENERAL_EVENTS.WALLET_INTRO_REQUEST_VIEWED)
break
case 2:
analyticsActions.logEvent(GENERAL_EVENTS.WALLET_INTRO_SEND_VIEWED)
break
case 3:
analyticsActions.logEvent(GENERAL_EVENTS.WALLET_INTRO_SWAP_VIEWED)
break
case 4:
analyticsActions.logEvent(GENERAL_EVENTS.WALLET_INTRO_BUYSELL_VIEWED)
break
}
}, [index])
=======
const CloseTourIcon = styled(Icon)`
&:hover {
color: ${({ theme }) => theme['grey600']};
}
&:active {
color: ${({ theme }) => theme['grey800']};
}
`
export const TourTooltip = props => {
>>>>>>>
const CloseTourIcon = styled(Icon)`
&:hover {
color: ${({ theme }) => theme['grey600']};
}
&:active {
color: ${({ theme }) => theme['grey800']};
}
`
const TourTooltipComponent = ({
analyticsActions,
index,
isLastStep,
primaryProps,
skipProps,
step,
tooltipProps,
...rest
}) => {
useEffect(() => {
switch (index) {
case 0:
analyticsActions.logEvent(GENERAL_EVENTS.WALLET_INTRO_PORTFOLIO_VIEWED)
break
case 1:
analyticsActions.logEvent(GENERAL_EVENTS.WALLET_INTRO_REQUEST_VIEWED)
break
case 2:
analyticsActions.logEvent(GENERAL_EVENTS.WALLET_INTRO_SEND_VIEWED)
break
case 3:
analyticsActions.logEvent(GENERAL_EVENTS.WALLET_INTRO_SWAP_VIEWED)
break
case 4:
analyticsActions.logEvent(GENERAL_EVENTS.WALLET_INTRO_BUYSELL_VIEWED)
break
}
}, [index])
<<<<<<<
<TooltipBody {...tooltipProps}>
<Icon
color='grey-600'
=======
<TooltipBody {...props.tooltipProps}>
<CloseTourIcon
color='grey400'
>>>>>>>
<TooltipBody {...tooltipProps}>
<CloseTourIcon
color='grey400' |
<<<<<<<
const initializeDashboard = function*() {
const btcContextR = yield select(
selectors.core.kvStore.lockbox.getLockboxBtcContext
)
const bchContextR = yield select(
selectors.core.kvStore.lockbox.getLockboxBchContext
)
const ethContextR = yield select(
selectors.core.kvStore.lockbox.getLockboxEthContext
)
yield put(
actions.core.data.bitcoin.fetchTransactions(
btcContextR.getOrElse(null),
true
)
)
yield put(
actions.core.data.ethereum.fetchTransactions(
ethContextR.getOrElse(null),
true
)
)
yield put(
actions.core.data.bch.fetchTransactions(bchContextR.getOrElse(null), true)
)
}
=======
/**
* Polls for device connection and application to be opened
* @param {String} actions.app - Requested application to wait for
* @param {String} actions.deviceId - Unique device ID
* @param {Number} [actions.timeout] - Length of time in ms to wait for a connection
* @returns {Action} Yields device connected action
* TODO: rename saga and yielded state changes to be more descriptive??
*/
const connectDevice = function*(actions) {
try {
const { app, deviceId, timeout } = actions.payload
const storedDevicesR = yield select(
selectors.core.kvStore.lockbox.getDevices
)
const storedDevices = storedDevicesR.getOrElse({})
const deviceType = storedDevices[deviceId].device_type
// TODO: this should yield multiple state changes for polling component/modal to use and act against
// 1) device is detected
// 2) application is opened
// 3) possible allow authorization?
yield call(LockboxService.pollForAppConnection, deviceType, app, timeout)
yield put(A.deviceConnected())
} catch (e) {
yield put(actions.logs.logErrorMessage(logLocation, 'connectDevice', e))
}
}
>>>>>>>
const initializeDashboard = function*() {
const btcContextR = yield select(
selectors.core.kvStore.lockbox.getLockboxBtcContext
)
const bchContextR = yield select(
selectors.core.kvStore.lockbox.getLockboxBchContext
)
const ethContextR = yield select(
selectors.core.kvStore.lockbox.getLockboxEthContext
)
yield put(
actions.core.data.bitcoin.fetchTransactions(
btcContextR.getOrElse(null),
true
)
)
yield put(
actions.core.data.ethereum.fetchTransactions(
ethContextR.getOrElse(null),
true
)
)
yield put(
actions.core.data.bch.fetchTransactions(bchContextR.getOrElse(null), true)
)
}
/**
* Polls for device connection and application to be opened
* @param {String} actions.app - Requested application to wait for
* @param {String} actions.deviceId - Unique device ID
* @param {Number} [actions.timeout] - Length of time in ms to wait for a connection
* @returns {Action} Yields device connected action
* TODO: rename saga and yielded state changes to be more descriptive??
*/
const connectDevice = function*(actions) {
try {
const { app, deviceId, timeout } = actions.payload
const storedDevicesR = yield select(
selectors.core.kvStore.lockbox.getDevices
)
const storedDevices = storedDevicesR.getOrElse({})
const deviceType = storedDevices[deviceId].device_type
// TODO: this should yield multiple state changes for polling component/modal to use and act against
// 1) device is detected
// 2) application is opened
// 3) possible allow authorization?
yield call(LockboxService.pollForAppConnection, deviceType, app, timeout)
yield put(A.deviceConnected())
} catch (e) {
yield put(actions.logs.logErrorMessage(logLocation, 'connectDevice', e))
}
} |
<<<<<<<
case AT.FETCH_ETHEREUM_CURRENT_BALANCE_LOADING: {
return assocPath(['current_balance', 'eth'], Remote.Loading, state)
=======
case AT.FETCH_ETH_CURRENT_BALANCE_LOADING: {
return assoc('current_balance', Remote.Loading, state)
>>>>>>>
case AT.FETCH_ETH_CURRENT_BALANCE_LOADING: {
return assocPath(['current_balance', 'eth'], Remote.Loading, state)
<<<<<<<
case AT.FETCH_ETHEREUM_TRANSACTIONS_FAILURE: {
return assocPath(
['transactions', 'eth'],
[Remote.Failure(payload)],
state
)
=======
case AT.FETCH_ETH_TRANSACTIONS_FAILURE: {
return assoc('transactions', [Remote.Failure(payload)], state)
>>>>>>>
case AT.FETCH_ETH_TRANSACTIONS_FAILURE: {
return assocPath(
['transactions', 'eth'],
[Remote.Failure(payload)],
state
) |
<<<<<<<
import {
requiredSSN,
requiredDOB,
normalizeSocialSecurity,
normalizeDateOfBirth,
ageOverEighteen } from 'services/FormHelper'
import { Helper1, Helper2 } from './helpers.js'
=======
import { requiredSSN, requiredDOB, normalizeSocialSecurity, normalizeDateOfBirth, ageOverEighteen } from 'services/FormHelper'
import { Form, ColLeft, ColRight, InputWrapper, PartnerHeader, PartnerSubHeader, ErrorWrapper } from '../styled'
>>>>>>>
import { requiredSSN, requiredDOB, normalizeSocialSecurity, normalizeDateOfBirth, ageOverEighteen } from 'services/FormHelper'
import { Form, ColLeft, ColRight, InputWrapper, PartnerHeader, PartnerSubHeader, ErrorWrapper } from '../styled'
import { Helper1, Helper2 } from './helpers.js' |
<<<<<<<
import { any, merge, path, prop, equals } from 'ramda'
=======
import { delay } from 'redux-saga'
>>>>>>>
import { any, merge, path, prop, equals } from 'ramda'
import { delay } from 'redux-saga'
<<<<<<<
=======
import { merge, path, prop, equals, head } from 'ramda'
>>>>>>>
import { merge, path, prop, equals, head } from 'ramda'
<<<<<<<
yield put(actions.form.change('buySellTabStatus', 'status', 'order_history'))
yield put(actions.modals.showModal('CoinifyTradeDetails',
{ trade: trade.data, status: status }))
=======
if (path(['type'], head(modals)) === 'CoinifyExchangeData') {
yield put(A.coinifySignupComplete())
yield call(delay, 500)
yield put(actions.modals.closeAllModals())
} else {
yield put(actions.form.change('buySellTabStatus', 'status', 'order_history'))
}
yield put(A.coinifyNextCheckoutStep('checkout'))
yield call(coreSagas.data.coinify.getKYCs)
yield put(actions.modals.showModal('CoinifyTradeDetails', { trade: trade.data, status: status }))
>>>>>>>
if (path(['type'], head(modals)) === 'CoinifyExchangeData') {
yield put(A.coinifySignupComplete())
yield call(delay, 500)
yield put(actions.modals.closeAllModals())
} else {
yield put(actions.form.change('buySellTabStatus', 'status', 'order_history'))
}
yield put(A.coinifyNextCheckoutStep('checkout'))
yield call(coreSagas.data.coinify.getKYCs)
yield put(actions.modals.showModal('CoinifyTradeDetails', { trade: trade.data, status: status }))
<<<<<<<
const deleteBankAccount = function * (payload) {
try {
yield call(coreSagas.data.coinify.deleteBankAccount, payload)
const quote = yield select(selectors.core.data.coinify.getQuote)
yield put(actions.core.data.coinify.getMediumsWithBankAccounts(quote.data))
} catch (e) {
yield put(actions.logs.logErrorMessage(logLocation, 'deleteBankAccount', e))
}
}
=======
const finishTrade = function * (data) {
const tradeToFinish = data.payload
try {
if (tradeToFinish.state === 'awaiting_transfer_in') {
if (tradeToFinish.medium === 'card') {
yield call(coreSagas.data.coinify.kycAsTrade, { kyc: tradeToFinish }) // core expects obj key to be 'kyc'
yield put(A.coinifyNextCheckoutStep('isx'))
} else if (tradeToFinish.medium === 'bank') {
yield put(actions.modals.showModal('CoinifyTradeDetails', { trade: tradeToFinish }))
}
}
} catch (e) {
yield put(actions.logs.logErrorMessage(logLocation, 'finishTrade', e))
}
}
const cancelISX = function * () {
const modals = yield select(selectors.modals.getModals)
const trade = yield select(selectors.core.data.coinify.getTrade)
if (path(['type'], head(modals)) === 'CoinifyExchangeData') {
yield put(actions.modals.closeAllModals())
} else if (trade.data.state === 'awaiting_transfer_in') {
yield put(actions.form.change('buySellTabStatus', 'status', 'order_history'))
yield put(A.coinifyNextCheckoutStep('checkout'))
} else {
yield put(A.coinifyNextCheckoutStep('checkout'))
}
}
const cancelTrade = function * (data) {
const trade = data.payload
try {
yield put(A.setCancelTradeId(trade.id))
yield put(A.coinifyLoading())
yield call(coreSagas.data.coinify.cancelTrade, { trade })
yield put(A.coinifySuccess())
} catch (e) {
yield put(actions.logs.logErrorMessage(logLocation, 'cancelTrade', e))
}
}
>>>>>>>
const deleteBankAccount = function * (payload) {
try {
yield call(coreSagas.data.coinify.deleteBankAccount, payload)
const quote = yield select(selectors.core.data.coinify.getQuote)
yield put(actions.core.data.coinify.getMediumsWithBankAccounts(quote.data))
} catch (e) {
yield put(actions.logs.logErrorMessage(logLocation, 'deleteBankAccount', e))
const finishTrade = function * (data) {
const tradeToFinish = data.payload
try {
if (tradeToFinish.state === 'awaiting_transfer_in') {
if (tradeToFinish.medium === 'card') {
yield call(coreSagas.data.coinify.kycAsTrade, { kyc: tradeToFinish }) // core expects obj key to be 'kyc'
yield put(A.coinifyNextCheckoutStep('isx'))
} else if (tradeToFinish.medium === 'bank') {
yield put(actions.modals.showModal('CoinifyTradeDetails', { trade: tradeToFinish }))
}
}
} catch (e) {
yield put(actions.logs.logErrorMessage(logLocation, 'finishTrade', e))
}
}
const cancelISX = function * () {
const modals = yield select(selectors.modals.getModals)
const trade = yield select(selectors.core.data.coinify.getTrade)
if (path(['type'], head(modals)) === 'CoinifyExchangeData') {
yield put(actions.modals.closeAllModals())
} else if (trade.data.state === 'awaiting_transfer_in') {
yield put(actions.form.change('buySellTabStatus', 'status', 'order_history'))
yield put(A.coinifyNextCheckoutStep('checkout'))
} else {
yield put(A.coinifyNextCheckoutStep('checkout'))
}
}
const cancelTrade = function * (data) {
const trade = data.payload
try {
yield put(A.setCancelTradeId(trade.id))
yield put(A.coinifyLoading())
yield call(coreSagas.data.coinify.cancelTrade, { trade })
yield put(A.coinifySuccess())
} catch (e) {
yield put(actions.logs.logErrorMessage(logLocation, 'cancelTrade', e))
}
}
<<<<<<<
sell,
setMinMax,
triggerKYC
=======
setMinMax,
cancelISX,
finishTrade,
cancelTrade
>>>>>>>
sell,
triggerKYC
setMinMax,
cancelISX,
finishTrade,
cancelTrade |
<<<<<<<
import { Form, CancelWrapper, ColLeft, ColRight, ColRightInner, InputWrapper, PartnerHeader, PartnerSubHeader } from 'components/IdentityVerification'
=======
import {
Form,
CancelWrapper,
ColLeft,
ColRight,
ColRightInner,
InputWrapper,
PartnerHeader,
PartnerSubHeader
} from 'components/BuySell/Signup'
>>>>>>>
import {
Form,
CancelWrapper,
ColLeft,
ColRight,
ColRightInner,
InputWrapper,
PartnerHeader,
PartnerSubHeader
} from 'components/IdentityVerification'
<<<<<<<
const busyHelper = (busy) => !busy ? <FormattedMessage id='coinifyexchangedata.payment.continue' defaultMessage='Continue' /> : <HeartbeatLoader height='20px' width='20px' color='white' />
=======
const faqHelper = () =>
helpers.map((el, i) => (
<Helper key={i} question={el.question} answer={el.answer} />
))
const busyHelper = busy =>
!busy ? (
<FormattedMessage
id='coinifyexchangedata.payment.continue'
defaultMessage='Continue'
/>
) : (
<HeartbeatLoader height='20px' width='20px' color='white' />
)
>>>>>>>
const busyHelper = busy =>
!busy ? (
<FormattedMessage
id='coinifyexchangedata.payment.continue'
defaultMessage='Continue'
/>
) : (
<HeartbeatLoader height='20px' width='20px' color='white' />
)
<<<<<<<
<FaqWrapper>
{ renderFaq(faqQuestions) }
</FaqWrapper>
=======
<FaqWrapper>{faqHelper()}</FaqWrapper>
>>>>>>>
<FaqWrapper>{renderFaq(faqQuestions)}</FaqWrapper> |
<<<<<<<
class RequestEthContainer extends React.PureComponent {
componentDidMount () {
=======
class RequestEthContainer extends React.PureComponent {
constructor (props) {
super(props)
this.init = this.init.bind(this)
this.onSubmit = this.onSubmit.bind(this)
this.handleRefresh = this.handleRefresh.bind(this)
this.handleOpenLockbox = this.handleOpenLockbox.bind(this)
}
componentWillMount () {
>>>>>>>
class RequestEthContainer extends React.PureComponent {
componentDidMount () {
<<<<<<<
init = () => {
this.props.formActions.initialize('requestEther', this.props.initialValues)
=======
init () {
this.props.formActions.initialize('requestEth', this.props.initialValues)
>>>>>>>
init = () => {
this.props.formActions.initialize('requestEth', this.props.initialValues) |
<<<<<<<
import {
required,
requiredUsZipcode,
normalizeUSZipcode } from 'services/FormHelper'
import { Helper1, Helper2 } from './helpers.js'
=======
import { required, requiredUsZipcode, normalizeUSZipcode } from 'services/FormHelper'
import { Form, ColLeft, ColRight, InputWrapper, PartnerHeader, PartnerSubHeader } from '../styled'
>>>>>>>
import { required, requiredUsZipcode, normalizeUSZipcode } from 'services/FormHelper'
import { Form, ColLeft, ColRight, InputWrapper, PartnerHeader, PartnerSubHeader } from '../styled'
import { Helper1, Helper2 } from './helpers.js' |
<<<<<<<
})
describe('decryptWallet (V3) wrong password', () => {
=======
>>>>>>> |
<<<<<<<
const { currency, type } = data.payload
console.log(type)
const baseAmount = type === 'buy' ? -1e8 : 1e8
const quote = yield apply(coinify, coinify.getBuyQuote, [baseAmount, 'BTC', currency])
=======
const quoteCurr = data.payload
const quote = yield apply(coinify, coinify.getBuyQuote, [-1e8, 'BTC', quoteCurr])
>>>>>>>
const { currency, type } = data.payload
const baseAmount = type === 'buy' ? -1e8 : 1e8
const quote = yield apply(coinify, coinify.getBuyQuote, [baseAmount, 'BTC', currency]) |
<<<<<<<
console.log(percentage, charity)
var percentageStyle = (percentage - 0.025) * 98 + '%'
=======
>>>>>>>
var percentageStyle = (percentage - 0.025) * 98 + '%'
<<<<<<<
<PercentageBox style={{left: percentageStyle}}>
{percentage}%
</PercentageBox>
<SimpleSlider min='0.01' max='1' step='0.01' onInput={handleSlide} value={percentage} />
=======
<SimpleSlider min={0.01} max={1} step={0.01} onInput={handleSlide} value={parseFloat(percentage)} />
>>>>>>>
<PercentageBox style={{left: percentageStyle}}>
{percentage}%
</PercentageBox>
<SimpleSlider min={0.01} max={1} step={0.01} onInput={handleSlide} value={parseFloat(percentage)} />
<<<<<<<
const enhance = modalEnhancer('Donation')
export default enhance(Donation)
=======
export default Donation
>>>>>>>
export default Donation |
<<<<<<<
const walletContext = yield select(selectors.wallet.getWalletContext)
const context = yield select(S.getContext)
=======
const context = yield select(selectors.wallet.getWalletContext)
const convertedAddress = isCashAddr(address) ? fromCashAddr(address) : address
>>>>>>>
const convertedAddress = isCashAddr(address)
? fromCashAddr(address)
: address
const walletContext = yield select(selectors.wallet.getWalletContext)
const context = yield select(S.getContext)
<<<<<<<
onlyShow: address || walletContext.join('|'),
=======
onlyShow: convertedAddress,
>>>>>>>
onlyShow: convertedAddress || walletContext.join('|'), |
<<<<<<<
import queryString from 'query-string'
import { assoc } from 'ramda'
=======
import BIP39 from 'bip39'
import * as ed25519 from 'ed25519-hd-key'
>>>>>>>
import queryString from 'query-string'
import { assoc } from 'ramda'
import BIP39 from 'bip39'
import * as ed25519 from 'ed25519-hd-key'
<<<<<<<
new BigNumber(amount).add(fee).toString()
export const encodeXlmURI = (address, memo, amount, note) => {
let data = {}
if (address) data = assoc('destination', address, data)
if (amount) data = assoc('amount', amount, data)
if (note) data = assoc('msg', note, data)
if (memo) data = assoc('memo', note, data)
return `web+stellar:pay?${queryString.stringify(data)}`
}
export const decodeXlmURI = uri => {
const query = uri.replace(/web\+stellar:pay(.*)/, ($0, $1) => $1)
const { destination, amount, memo, msg } = queryString.parse(query)
return { address: destination, amount, memo, note: msg }
}
=======
new BigNumber(amount).add(fee).toString()
export const getKeyPair = mnemonic => {
const seed = BIP39.mnemonicToSeed(mnemonic)
const seedHex = seed.toString('hex')
const masterKey = ed25519.derivePath("m/44'/148'/0'", seedHex)
return StellarSdk.Keypair.fromRawEd25519Seed(masterKey.key)
}
>>>>>>>
new BigNumber(amount).add(fee).toString()
export const encodeXlmURI = (address, memo, amount, note) => {
let data = {}
if (address) data = assoc('destination', address, data)
if (amount) data = assoc('amount', amount, data)
if (note) data = assoc('msg', note, data)
if (memo) data = assoc('memo', note, data)
return `web+stellar:pay?${queryString.stringify(data)}`
}
export const decodeXlmURI = uri => {
const query = uri.replace(/web\+stellar:pay(.*)/, ($0, $1) => $1)
const { destination, amount, memo, msg } = queryString.parse(query)
return { address: destination, amount, memo, note: msg }
}
export const getKeyPair = mnemonic => {
const seed = BIP39.mnemonicToSeed(mnemonic)
const seedHex = seed.toString('hex')
const masterKey = ed25519.derivePath("m/44'/148'/0'", seedHex)
return StellarSdk.Keypair.fromRawEd25519Seed(masterKey.key)
} |
<<<<<<<
navigationDisplayed: false,
securityCenterMenuDisplayed: false
=======
securityCenterMenuDisplayed: false,
navigationDisplayed: false,
headerMenuDisplayed: false
>>>>>>>
headerMenuDisplayed: false,
navigationDisplayed: false,
securityCenterMenuDisplayed: false
<<<<<<<
case actions.TOGGLE_DROPDOWN_LANGUAGE: {
return assign(INITIAL_STATE, { dropdownLanguageDisplayed: !state.dropdownLanguageDisplayed })
}
=======
case actions.TOGGLE_HEADER_MENU: {
return assign(INITIAL_STATE, { headerMenuDisplayed: !state.headerMenuDisplayed })
}
>>>>>>>
case actions.TOGGLE_HEADER_MENU: {
return assign(INITIAL_STATE, { headerMenuDisplayed: !state.headerMenuDisplayed })
}
case actions.TOGGLE_DROPDOWN_LANGUAGE: {
return assign(INITIAL_STATE, { dropdownLanguageDisplayed: !state.dropdownLanguageDisplayed })
} |
<<<<<<<
import { required, requiredDOB, ageOverEighteen } from 'services/FormHelper'
import { PERSONAL_FORM } from 'data/components/identityVerification/model'
=======
import { model } from 'data'
import {
required,
requiredDOB,
ageOverEighteen,
normalizeDateOfBirth
} from 'services/FormHelper'
>>>>>>>
import { required, requiredDOB, ageOverEighteen } from 'services/FormHelper'
import { model } from 'data' |
<<<<<<<
const { val, disabled, setMax, setMin, limits, checkoutError, defaultCurrency, symbol, increaseLimit, type } = props
const { level } = val
=======
const { val, disabled, setMax, setMin, limits, checkoutError, defaultCurrency, symbol, increaseLimit } = props
>>>>>>>
const { val, disabled, setMax, setMin, limits, checkoutError, defaultCurrency, symbol, increaseLimit, type } = props
<<<<<<<
<Wrapper>
<FiatConvertorInput>
<Container>
<Field name='leftVal' component={TextBoxDebounced} disabled={disabled} borderRightNone={1} />
<Field name='currency' component={SelectBoxCoinifyCurrency} defaultDisplay={defaultCurrency} />
</Container>
<ArrowRight weight={600} size='22px' name='right-arrow' />
<Container>
<Field name='rightVal' component={TextBoxDebounced} disabled={disabled} />
<Unit>{currency}</Unit>
</Container>
</FiatConvertorInput>
{
checkoutError
? <Error size='13px' weight={300} color='error'>
{ getLimitsError(checkoutError, limits, symbol, setMin) }
</Error>
: <LimitsHelper>
{type === 'buy'
? <FormattedMessage id='buy.quote_input.remaining_buy_limit'
defaultMessage='Your remaining buy limit is {max}' values={{ max: <a onClick={() => setMax(limits.max)}>{symbol}{limits.max}</a> }} />
: <FormattedMessage id='sell.quote_input.remaining_buy_limit'
defaultMessage='Your remaining sell limit is {max}' values={{ max: <a onClick={() => setMax(limits.max)}>{symbol}{limits.max}</a> }} />
}
{level.name < 2 && <a onClick={() => increaseLimit()}><FormattedMessage id='quote_input.increase_limits' defaultMessage='Increase your limit.' /></a>}
</LimitsHelper>
}
</Wrapper>
=======
<form>
<Wrapper>
<FiatConvertorInput>
<Container>
<Field name='leftVal' component={TextBoxDebounced} disabled={disabled || !canTrade} borderRightNone={1} />
<Field name='currency' component={SelectBoxCoinifyCurrency} defaultDisplay={defaultCurrency} />
</Container>
<ArrowRight weight={600} size='22px' name='right-arrow' />
<Container>
<Field name='rightVal' component={TextBoxDebounced} disabled={disabled || !canTrade} />
<Unit>{currency}</Unit>
</Container>
</FiatConvertorInput>
{ renderErrorsAndLimits() }
</Wrapper>
</form>
>>>>>>>
<Wrapper>
<FiatConvertorInput>
<Container>
<Field name='leftVal' component={TextBoxDebounced} disabled={disabled || !canTrade} borderRightNone={1} />
<Field name='currency' component={SelectBoxCoinifyCurrency} defaultDisplay={defaultCurrency} />
</Container>
<ArrowRight weight={600} size='22px' name='right-arrow' />
<Container>
<Field name='rightVal' component={TextBoxDebounced} disabled={disabled || !canTrade} />
<Unit>{currency}</Unit>
</Container>
</FiatConvertorInput>
{ renderErrorsAndLimits() }
</Wrapper> |
<<<<<<<
export const isSecondPasswordOn = compose(Wallet.isDoubleEncrypted, Wrapper.selectWallet)
export const isMnemonicVerified = compose(HDWallet.selectMnemonicVerified, HDWalletList.selectHDWallet, Wallet.selectHdWallets, Wrapper.selectWallet)
=======
export const isSecondPasswordOn = compose(Wallet.isDoubleEncrypted, Wrapper.selectWallet)
export const getMainPassword = Wrapper.selectPassword
export const getPbkdf2Iterations = Wrapper.selectPbkdf2Iterations
>>>>>>>
export const isSecondPasswordOn = compose(Wallet.isDoubleEncrypted, Wrapper.selectWallet)
export const isMnemonicVerified = compose(HDWallet.selectMnemonicVerified, HDWalletList.selectHDWallet, Wallet.selectHdWallets, Wrapper.selectWallet)
export const getMainPassword = Wrapper.selectPassword
export const getPbkdf2Iterations = Wrapper.selectPbkdf2Iterations |
<<<<<<<
export default function*({
api,
bchSocket,
btcSocket,
ethSocket,
ratesSocket,
options
}) {
const coreSagas = coreSagasFactory({ api })
=======
export default function*({
api,
bchSocket,
btcSocket,
ethSocket,
networks,
options
}) {
const coreSagas = coreSagasFactory({ api, networks })
>>>>>>>
export default function*({
api,
bchSocket,
btcSocket,
ethSocket,
ratesSocket,
networks,
options
}) {
const coreSagas = coreSagasFactory({ api, networks })
<<<<<<<
fork(components({ api, coreSagas, options })),
fork(modules({ api, coreSagas })),
=======
fork(components({ api, coreSagas, networks, options })),
fork(modules({ coreSagas, networks })),
>>>>>>>
fork(components({ api, coreSagas, networks, options })),
fork(modules({ api, coreSagas, networks })),
<<<<<<<
fork(middleware({ api, bchSocket, btcSocket, ethSocket, ratesSocket })),
fork(coreRootSagaFactory({ api, options })),
=======
fork(middleware({ api, bchSocket, btcSocket, ethSocket })),
fork(coreRootSagaFactory({ api, networks, options })),
>>>>>>>
fork(middleware({ api, bchSocket, btcSocket, ethSocket, ratesSocket })),
fork(coreRootSagaFactory({ api, networks, options })), |
<<<<<<<
const userFlowSupported = (yield select(
selectors.modules.profile.userFlowSupported
)).getOrElse(false)
if (userFlowSupported) yield put(actions.modules.profile.signIn())
yield call(coreSagas.data.xlm.fetchLedgerDetails)
yield call(coreSagas.data.xlm.fetchAccount)
=======
yield call(authNabu)
>>>>>>>
yield call(coreSagas.data.xlm.fetchLedgerDetails)
yield call(coreSagas.data.xlm.fetchAccount)
yield call(authNabu) |
<<<<<<<
})
export const createLinkAccountId = () => ({
type: AT.CREATE_LINK_ACCOUNT_ID
})
export const createLinkAccountIdLoading = () => ({
type: AT.CREATE_LINK_ACCOUNT_ID_LOADING
})
export const createLinkAccountIdSuccess = data => ({
type: AT.CREATE_LINK_ACCOUNT_ID_SUCCESS,
payload: { data }
})
export const createLinkAccountIdFailure = e => ({
type: AT.CREATE_LINK_ACCOUNT_ID_FAILURE,
payload: { e }
=======
})
export const shareAddresses = () => ({
type: AT.SHARE_ADDRESSES
})
export const shareAddressesLoading = () => ({
type: AT.SHARE_ADDRESSES_LOADING
})
export const shareAddressesSuccess = data => ({
type: AT.SHARE_ADDRESSES_SUCCESS,
payload: { data }
})
export const shareAddressesFailure = e => ({
type: AT.SHARE_ADDRESSES_FAILURE,
payload: { e }
>>>>>>>
})
export const createLinkAccountId = () => ({
type: AT.CREATE_LINK_ACCOUNT_ID
})
export const createLinkAccountIdLoading = () => ({
type: AT.CREATE_LINK_ACCOUNT_ID_LOADING
})
export const createLinkAccountIdSuccess = data => ({
type: AT.CREATE_LINK_ACCOUNT_ID_SUCCESS,
payload: { data }
})
export const createLinkAccountIdFailure = e => ({
type: AT.CREATE_LINK_ACCOUNT_ID_FAILURE,
payload: { e }
})
export const shareAddresses = () => ({
type: AT.SHARE_ADDRESSES
})
export const shareAddressesLoading = () => ({
type: AT.SHARE_ADDRESSES_LOADING
})
export const shareAddressesSuccess = data => ({
type: AT.SHARE_ADDRESSES_SUCCESS,
payload: { data }
})
export const shareAddressesFailure = e => ({
type: AT.SHARE_ADDRESSES_FAILURE,
payload: { e } |
<<<<<<<
this.$.bottomBar.createFileTab(f.name, id);
=======
this.$.bottomBar.createFileTab(f.name, f.id);
this.$.slideable.setDraggable(true);
>>>>>>>
this.$.bottomBar.createFileTab(f.name, id);
this.$.slideable.setDraggable(true);
<<<<<<<
Ares.Data.Files.removeEntry(inEvent.id);
this.$.bottomBar.removeTab(inEvent.id);
=======
delete this.openFiles[id];
this.$.bottomBar.removeTab(id);
this.$.slideable.setDraggable(Object.keys(this.openFiles).count > 0);
>>>>>>>
Ares.Data.Files.removeEntry(inEvent.id);
this.$.bottomBar.removeTab(inEvent.id);
this.$.slideable.setDraggable(Object.keys(this.openFiles).count > 0);
<<<<<<<
this.$.bottomBar.activateFileWithId(d.getId());
=======
this.adjustBarMode();
this.$.bottomBar.activateFileWithId(d.file.id);
>>>>>>>
this.adjustBarMode();
this.$.bottomBar.activateFileWithId(d.getId()); |
<<<<<<<
import ui from 'redux-ui'
import { isNil, not } from 'ramda'
=======
>>>>>>>
import { isNil, not } from 'ramda'
<<<<<<<
error: selectors.auth.getError(state),
lastGuid: selectors.cache.getLastGuid(state)
=======
data: selectors.auth.getLogin(state)
>>>>>>>
lastGuid: selectors.cache.getLastGuid(state),
data: selectors.auth.getLogin(state) |
<<<<<<<
default: return <FormattedMessage id='components.alerts.unknown_error' defaultMessage='An error has occurred.' />
=======
case C.CAPTCHA_CODE_INCORRECT: return <FormattedMessage id='components.alerts.captcha_code_incorrect' defaultMessage='The captcha you provided was incorrect, please try again' />
default: return <FormattedMessage id='components.alerts.uknown_error' defaultMessage='An error has occured.' />
>>>>>>>
case C.CAPTCHA_CODE_INCORRECT: return <FormattedMessage id='components.alerts.captcha_code_incorrect' defaultMessage='The captcha you provided was incorrect, please try again' />
default: return <FormattedMessage id='components.alerts.unknown_error' defaultMessage='An error has occurred.' /> |
<<<<<<<
export const coreSagasFactory = ({ api, dataPath, walletPath, settingsPath, socket } = {}) => ({
adverts: advertsSaga({ api, dataPath, walletPath, settingsPath, socket }),
captcha: captchaSaga({ api, dataPath, walletPath, settingsPath, socket }),
charts: chartsSaga({ api, dataPath, walletPath, settingsPath, socket }),
fee: feeSaga({ api, dataPath, walletPath, settingsPath, socket }),
logs: logsSaga({ api, dataPath, walletPath, settingsPath, socket }),
rates: ratesSaga({ api, dataPath, walletPath, settingsPath, socket }),
transactions: transactionsSaga({ api, dataPath, walletPath, settingsPath, socket }),
payment: paymentSaga({ api, dataPath, walletPath, settingsPath, socket }),
common: commonSaga({ api, dataPath, walletPath, settingsPath, socket }),
settings: settingsSaga({ api, dataPath, walletPath, settingsPath, socket }),
wallet: walletSaga({ api, dataPath, walletPath, settingsPath, socket }),
webSocket: webSocketSaga({ api, dataPath, walletPath, settingsPath, socket })
})
// export const rootSaga = ({ api, dataPath, walletPath, settingsPath, socket } = {}) => {
// return function * () {
// yield [
// fork(webSocketSaga({socket, walletPath, dataPath, api}))
// ]
// }
// }
=======
export const rootSaga = ({ api, dataPath, walletPath, settingsPath, socket } = {}) => {
return function * () {
yield [
fork(advertsSaga({api})),
fork(captchaSaga({ api })),
fork(feeSaga({api})),
fork(logsSaga({ api })),
fork(btcRatesSaga({api})),
fork(ethRatesSaga({api})),
fork(settingsSaga({api})),
fork(transactionsSaga({api, walletPath, dataPath})),
fork(commonSaga({api})),
fork(paymentSaga({api, walletPath, dataPath})),
fork(walletSaga({api, walletPath})),
fork(webSocketSaga({socket, walletPath, dataPath, api})),
fork(walletOptionsSaga({api}))
]
}
}
>>>>>>>
export const coreSagasFactory = ({ api, dataPath, walletPath, settingsPath, socket } = {}) => ({
adverts: advertsSaga({ api, dataPath, walletPath, settingsPath, socket }),
captcha: captchaSaga({ api, dataPath, walletPath, settingsPath, socket }),
charts: chartsSaga({ api, dataPath, walletPath, settingsPath, socket }),
fee: feeSaga({ api, dataPath, walletPath, settingsPath, socket }),
logs: logsSaga({ api, dataPath, walletPath, settingsPath, socket }),
rates: ratesSaga({ api, dataPath, walletPath, settingsPath, socket }),
transactions: transactionsSaga({ api, dataPath, walletPath, settingsPath, socket }),
payment: paymentSaga({ api, dataPath, walletPath, settingsPath, socket }),
common: commonSaga({ api, dataPath, walletPath, settingsPath, socket }),
settings: settingsSaga({ api, dataPath, walletPath, settingsPath, socket }),
wallet: walletSaga({ api, dataPath, walletPath, settingsPath, socket }),
webSocket: webSocketSaga({ api, dataPath, walletPath, settingsPath, socket })
}) |
<<<<<<<
import { isNil, find, map, prepend, prop, propEq, test, head } from 'ramda'
=======
import { find, map, propEq } from 'ramda'
>>>>>>>
import { find, map, prop, propEq, test, head } from 'ramda' |
<<<<<<<
const trade = yield call(
api.executeTrade,
quote,
refundAddress,
destinationAddress
)
=======
// Ask for second password or lockbox transport
if (source.type !== ADDRESS_TYPES.LOCKBOX) {
password = yield call(promptForSecondPassword)
} else {
const deviceR = yield select(
selectors.core.kvStore.lockbox.getDeviceFromCoinAddrs,
prop('coin', source),
[prop('address', source)]
)
const device = deviceR.getOrFail(MISSING_DEVICE_ERROR)
const coin = prop('coin', source)
const deviceType = prop('device_type', device)
yield call(promptForLockbox, coin, null, deviceType)
scrambleKey = Lockbox.utils.getScrambleKey(coin, deviceType)
connection = yield select(
selectors.components.lockbox.getCurrentConnection
)
}
// Execute trade
>>>>>>>
// Ask for second password or lockbox transport
if (source.type !== ADDRESS_TYPES.LOCKBOX) {
password = yield call(promptForSecondPassword)
} else {
const deviceR = yield select(
selectors.core.kvStore.lockbox.getDeviceFromCoinAddrs,
prop('coin', source),
[prop('address', source)]
)
const device = deviceR.getOrFail(MISSING_DEVICE_ERROR)
const coin = prop('coin', source)
const deviceType = prop('device_type', device)
yield call(promptForLockbox, coin, null, deviceType)
scrambleKey = Lockbox.utils.getScrambleKey(coin, deviceType)
connection = yield select(
selectors.components.lockbox.getCurrentConnection
)
}
// Execute trade
const trade = yield call(
api.executeTrade,
quote,
refundAddress,
destinationAddress
) |
<<<<<<<
import ServiceAnnouncement from 'components/ServiceAnnouncement'
=======
import ErrorBoundary from 'providers/ErrorBoundaryProvider'
>>>>>>>
import ServiceAnnouncement from 'components/ServiceAnnouncement'
import ErrorBoundary from 'providers/ErrorBoundaryProvider'
<<<<<<<
<Alerts />
<Modals />
<HeaderContainer>
<Header />
</HeaderContainer>
<ContentContainer>
<AnnouncementWrapper>
<ServiceAnnouncement />
</AnnouncementWrapper>
<ErrorBoundary>
=======
<ErrorBoundary>
<Alerts />
<HeaderContainer>
<Header />
</HeaderContainer>
<ContentContainer>
>>>>>>>
<ErrorBoundary>
<Alerts />
<HeaderContainer>
<Header />
</HeaderContainer>
<ContentContainer>
<AnnouncementWrapper>
<ServiceAnnouncement />
</AnnouncementWrapper> |
<<<<<<<
import { select } from 'redux-saga/effects'
=======
import { call, select } from 'redux-saga/effects'
import { map, set } from 'ramda'
import { futurizeP } from 'futurize'
import Task from 'data.task'
>>>>>>>
import { call, select } from 'redux-saga/effects'
import { map, set } from 'ramda'
import { futurizeP } from 'futurize'
import Task from 'data.task'
<<<<<<<
import { txHexToHashHex } from '../../../utils/bitcoin'
=======
import * as CoinSelection from '../../../coinSelection'
import * as Coin from '../../../coinSelection/coin'
>>>>>>>
import * as CoinSelection from '../../../coinSelection'
import * as Coin from '../../../coinSelection/coin'
import { txHexToHashHex } from '../../../utils/bitcoin'
<<<<<<<
const wrapper = yield select(wS.getWrapper)
const signAndPublish = (sel, pass) => taskToPromise(sign(network, pass, wrapper, sel))
.then(txHex => api.pushBitcoinTx(txHex)
.then(() => txHexToHashHex(txHex)))
return yield signAndPublish(selection, password)
=======
let wrapper = yield select(S.wallet.getWrapper)
let signAndPublish = sign(network, password, wrapper, selection).chain(pushBitcoinTx)
return yield call(() => taskToPromise(signAndPublish))
>>>>>>>
const wrapper = yield select(wS.getWrapper)
const signAndPublish = (sel, pass) => taskToPromise(sign(network, pass, wrapper, sel))
.then(txHex => api.pushBitcoinTx(txHex)
.then(() => txHexToHashHex(txHex)))
return yield signAndPublish(selection, password) |
<<<<<<<
const nextAddressData = yield call(prepareAddress)
const trade = yield call(coreSagas.data.sfox.handleTrade, action.payload, nextAddressData)
=======
const trade = yield call(coreSagas.data.sfox.handleTrade, action.payload)
if (prop('message', trade) || prop('name', trade) === 'AssertionError') {
if (trade.message === 'QUOTE_EXPIRED') {
throw new Error("The quote has expired. If this continues to happen, we recommend automatically setting your computer's date & time.")
}
throw new Error(trade.message)
}
>>>>>>>
const nextAddressData = yield call(prepareAddress)
const trade = yield call(coreSagas.data.sfox.handleTrade, action.payload, nextAddressData)
if (prop('message', trade) || prop('name', trade) === 'AssertionError') {
if (trade.message === 'QUOTE_EXPIRED') {
throw new Error("The quote has expired. If this continues to happen, we recommend automatically setting your computer's date & time.")
}
throw new Error(trade.message)
} |
<<<<<<<
<Wrapper>
<ColumnLeft>
<Shapeshift />
<Support />
</ColumnLeft>
<ColumnRight>
<Info />
</ColumnRight>
</Wrapper>
=======
<ExchangeLayout>
<Wrapper>
<ColumnLeft>
<Shapeshift />
</ColumnLeft>
<ColumnRight>
<Info />
</ColumnRight>
</Wrapper>
</ExchangeLayout>
>>>>>>>
<Wrapper>
<ColumnLeft>
<Shapeshift />
</ColumnLeft>
<ColumnRight>
<Info />
</ColumnRight>
</Wrapper> |
<<<<<<<
Success: val => <LockboxMenu deviceInfo={val} {...rest} />,
=======
Success: val => (
<LockboxMenu
deviceInfo={val}
location={this.props.location}
deviceIndex={this.props.match.params.deviceIndex}
/>
),
>>>>>>>
Success: val => (
<LockboxMenu
deviceInfo={val}
location={this.props.location}
deviceIndex={this.props.match.params.deviceIndex}
{...rest}
/>
),
<<<<<<<
const mapStateToProps = state => ({
data: getData(state),
formValues: getFormValues(state)
=======
const mapStateToProps = (state, ownProps) => ({
data: selectors.core.kvStore.lockbox.getDevice(
state,
ownProps.match.params.deviceIndex
)
>>>>>>>
const mapStateToProps = (state, ownProps) => ({
data: selectors.core.kvStore.lockbox.getDevice(
state,
ownProps.match.params.deviceIndex
),
formValues: getFormValues(state) |
<<<<<<<
it('should check for data errors', () => {
saga.next().fork(checkDataErrors)
})
=======
it('should dispatch action for reportBalanceStats', () => {
saga.next().put(actions.analytics.reportBalanceStats())
})
>>>>>>>
it('should check for data errors', () => {
saga.next().fork(checkDataErrors)
})
it('should dispatch action for reportBalanceStats', () => {
saga.next().put(actions.analytics.reportBalanceStats())
}) |
<<<<<<<
=======
const UglifyJSPlugin = require('uglifyjs-webpack-plugin')
const { UnusedFilesWebpackPlugin } = require('unused-files-webpack-plugin')
>>>>>>>
const { UnusedFilesWebpackPlugin } = require('unused-files-webpack-plugin') |
<<<<<<<
import lockbox from './lockbox/sagaRegister'
=======
import userCredentials from './userCredentials/sagaRegister'
>>>>>>>
import lockbox from './lockbox/sagaRegister'
import userCredentials from './userCredentials/sagaRegister'
<<<<<<<
yield fork(lockbox({ api, networks }))
=======
yield fork(userCredentials({ api, networks }))
>>>>>>>
yield fork(lockbox({ api, networks }))
yield fork(userCredentials({ api, networks })) |
<<<<<<<
webSocketCoins: jest.fn(),
streamingXlm: jest.fn(),
webSocketRates: jest.fn(),
autoDisconnection: jest.fn()
=======
autoDisconnection: jest.fn(),
matomoMiddleware: jest.fn(),
streamingXlm: jest.fn(),
webSocketBch: jest.fn(),
webSocketBtc: jest.fn(),
webSocketEth: jest.fn(),
webSocketRates: jest.fn()
>>>>>>>
autoDisconnection: jest.fn(),
matomoMiddleware: jest.fn(),
streamingXlm: jest.fn(),
webSocketCoins: jest.fn(),
webSocketRates: jest.fn()
<<<<<<<
coinsSocketSpy
=======
matomoMiddlewareSpy,
btcSocketSpy,
bchSocketSpy,
ethSocketSpy
>>>>>>>
matomoMiddlewareSpy,
coinsSocketSpy
<<<<<<<
coinsSocketSpy = jest.spyOn(Middleware, 'webSocketCoins')
=======
btcSocketSpy = jest.spyOn(Middleware, 'webSocketBtc')
bchSocketSpy = jest.spyOn(Middleware, 'webSocketBch')
ethSocketSpy = jest.spyOn(Middleware, 'webSocketEth')
matomoMiddlewareSpy = jest.spyOn(Middleware, 'matomoMiddleware')
>>>>>>>
coinsSocketSpy = jest.spyOn(Middleware, 'webSocketCoins')
matomoMiddlewareSpy = jest.spyOn(Middleware, 'matomoMiddleware') |
<<<<<<<
=======
yield takeLatest(AT.DELETE_DEVICE, lockboxSagas.deleteDevice)
yield takeLatest(AT.CONNECT_DEVICE, lockboxSagas.connectDevice)
yield takeLatest(AT.INITIALIZE_DASHBOARD, lockboxSagas.initializeDashboard)
>>>>>>>
yield takeLatest(AT.INITIALIZE_DASHBOARD, lockboxSagas.initializeDashboard) |
<<<<<<<
const settingsSagas = settingsSagaFactory({ api })
const pushBitcoinTx = futurizeP(Task)(api.pushBitcoinTx)
const getWalletUnspent = (network, fromData) =>
=======
const __pushBitcoinTx = futurizeP(Task)(api.pushBitcoinTx)
const __getWalletUnspent = (network, fromData) =>
>>>>>>>
const settingsSagas = settingsSagaFactory({ api })
const __pushBitcoinTx = futurizeP(Task)(api.pushBitcoinTx)
const __getWalletUnspent = (network, fromData) =>
<<<<<<<
let result = yield call(calculatePublish, p.txHex)
yield call(settingsSagas.setLastTxTime)
=======
let result = yield call(__calculatePublish, prop('txHex', p))
>>>>>>>
let result = yield call(__calculatePublish, prop('txHex', p))
yield call(settingsSagas.setLastTxTime) |
<<<<<<<
=======
import Logout from './Logout'
import Open from './Open'
>>>>>>>
import Logout from './Logout' |
<<<<<<<
use: [
'thread-loader',
'babel-loader'
]
=======
use: [
{
loader: 'babel-loader',
options: {
plugins: [
'babel-plugin-styled-components',
['module-resolver', { 'root': ['./src'] }]
]
}
}
]
>>>>>>>
use: [
'thread-loader',
{
loader: 'babel-loader',
options: {
plugins: [
'babel-plugin-styled-components',
['module-resolver', { 'root': ['./src'] }]
]
}
}
] |
<<<<<<<
<Icon name='short-right-arrow' color='blue600' size='18px' />
=======
<Icon name='arrow-right' color='brand-secondary' size='18px' />
>>>>>>>
<Icon name='arrow-right' color='blue600' size='18px' /> |
<<<<<<<
uppercase
disabled={submitting || invalid || pristine || disableLockboxSend}
=======
disabled={submitting || invalid || pristine}
>>>>>>>
disabled={submitting || invalid || pristine || disableLockboxSend} |
<<<<<<<
{renderDetailsRow(
'order_details.amount_to_purchase',
trade.isBuy ? 'BTC Amount to Purchase' : 'BTC Amount to Sell',
renderFirstRow(trade))
}
<OrderDetailsRow>
<ToolTipWrapper>
<Text size='13px' weight={300}>
<FormattedMessage id='orderdetails.tradingfee' defaultMessage='Trading Fee' />
</Text>
<Tooltip>
<FormattedMessage id='orderdetails.tradingfee.tooltip' defaultMessage='The fee charged to execute a trade through SFOX.' />
</Tooltip>
</ToolTipWrapper>
<Text size='13px' weight={300}>{`$${trade.feeAmount.toFixed(2)}`}</Text>
</OrderDetailsRow>
{renderDetailsRow(
'order_details.total_cost',
trade.isBuy ? 'Total Cost' : 'Total To Be Received',
renderTotal(trade),
'success'
)}
=======
<OrderDetailsRow>
{
trade.isBuy
? <Text size='13px' weight={300}><FormattedMessage id='orderdetails.amounttopurchase' defaultMessage='BTC Amount to Purchase' /></Text>
: <Text size='13px' weight={300}><FormattedMessage id='orderdetails.amounttosell' defaultMessage='BTC Amount to Sell' /></Text>
}
<Text size='13px' weight={300}>{renderFirstRow(trade)}</Text>
</OrderDetailsRow>
<OrderDetailsRow>
<Text size='13px' weight={300}><FormattedMessage id='orderdetails.tradingfee' defaultMessage='Trading Fee' /></Text>
<Text size='13px' weight={300}>{`$${(+trade.feeAmount).toFixed(2)}`}</Text>
</OrderDetailsRow>
<OrderDetailsRow>
{
trade.isBuy
? <Text size='13px' weight={300}><FormattedMessage id='orderdetails.totalcost' defaultMessage='Total Cost' /></Text>
: <Text size='13px' weight={300}><FormattedMessage id='orderdetails.totaltobereceived' defaultMessage='Total to be Received' /></Text>
}
<Text size='13px' weight={300} color='success'>{renderTotal(trade)}</Text>
</OrderDetailsRow>
>>>>>>>
<OrderDetailsRow>
{
trade.isBuy
? <Text size='13px' weight={300}><FormattedMessage id='orderdetails.amounttopurchase' defaultMessage='BTC Amount to Purchase' /></Text>
: <Text size='13px' weight={300}><FormattedMessage id='orderdetails.amounttosell' defaultMessage='BTC Amount to Sell' /></Text>
}
<Text size='13px' weight={300}>{renderFirstRow(trade)}</Text>
</OrderDetailsRow>
<OrderDetailsRow>
<ToolTipWrapper>
<Text size='13px' weight={300}>
<FormattedMessage id='orderdetails.tradingfee' defaultMessage='Trading Fee' />
</Text>
<Tooltip>
<FormattedMessage id='orderdetails.tradingfee.tooltip' defaultMessage='The fee charged to execute a trade through SFOX.' />
</Tooltip>
</ToolTipWrapper>
<Text size='13px' weight={300}>{`$${trade.feeAmount.toFixed(2)}`}</Text>
</OrderDetailsRow>
<OrderDetailsRow>
{
trade.isBuy
? <Text size='13px' weight={300}><FormattedMessage id='orderdetails.totalcost' defaultMessage='Total Cost' /></Text>
: <Text size='13px' weight={300}><FormattedMessage id='orderdetails.totaltobereceived' defaultMessage='Total to be Received' /></Text>
}
<Text size='13px' weight={300} color='success'>{renderTotal(trade)}</Text>
</OrderDetailsRow> |
<<<<<<<
=======
/**
* Deep-clone given object
* @param {Object} obj object to clone
* @private
*/
clone: function(obj) {
return this.extend(undefined, obj);
},
/**
* Extend destination object using source object (deep)
* @param {Object} dst destination object
* @param {Object} src source object
* @private
*/
extend: function(dst, src) {
if (dst === undefined) {
if (!src) {
return src;
}
dst = (src instanceof Array) ? [] : {};
}
for (var i in src) {
if (typeof src[i] == "object") {
dst[i] = this.extend(dst[i], src[i]);
} else {
dst[i] = src[i];
}
}
return dst;
},
// used to pre-fill properties of a new project
// contains default values
PREFILLED_CONFIG_FOR_UI: {
build: {
phonegap: {
enabled: false,
icon: {
src: "icon.png",
role: "default"
},
preferences: {
"phonegap-version": "2.0.0"
}
}
}
},
>>>>>>>
// used to pre-fill properties of a new project
// contains default values
PREFILLED_CONFIG_FOR_UI: {
build: {
phonegap: {
enabled: false,
icon: {
src: "icon.png",
role: "default"
},
preferences: {
"phonegap-version": "2.0.0"
}
}
}
}, |
<<<<<<<
{renderDetailsRow(
'order_details.amount_to_transact',
type === 'buy' ? 'BTC Amount to Purchase' : 'BTC Amount to Sell',
quoteR.map(quote => reviewOrder.renderFirstRow(quote, type)).getOrElse('~')
)}
<OrderDetailsRow>
<ToolTipWrapper>
<Text size='13px' weight={300}>
<FormattedMessage id='orderdetails.tradingfee' defaultMessage='Trading Fee' />
</Text>
<Tooltip>
<FormattedMessage id='orderdetails.tradingfee.tooltip' defaultMessage='The fee charged to execute a trade through SFOX.' />
</Tooltip>
</ToolTipWrapper>
<Text size='13px' weight={300}>{quoteR.map(quote => `$${(+quote.feeAmount).toFixed(2)}`).getOrElse('~')}</Text>
</OrderDetailsRow>
{renderDetailsRow(
'order_details.total_transacted',
type === 'buy' ? 'Total Cost' : 'Total to be Received',
quoteR.map(quote => reviewOrder.renderTotal(quote, type)).getOrElse('~'),
'success'
)}
=======
<OrderDetailsRow>
{
type === 'buy'
? <Text size='13px' weight={300}><FormattedMessage id='orderdetails.amounttopurchase' defaultMessage='BTC Amount to Purchase' /></Text>
: <Text size='13px' weight={300}><FormattedMessage id='orderdetails.amounttosell' defaultMessage='BTC Amount to Sell' /></Text>
}
<Text size='13px' weight={300}>{quoteR.map(quote => reviewOrder.renderFirstRow(quote, type)).getOrElse('~')}</Text>
</OrderDetailsRow>
<OrderDetailsRow>
<Text size='13px' weight={300}><FormattedMessage id='orderdetails.tradingfee' defaultMessage='Trading Fee' /></Text>
<Text size='13px' weight={300}>{quoteR.map(quote => `$${(+quote.feeAmount).toFixed(2)}`).getOrElse('~')}</Text>
</OrderDetailsRow>
<OrderDetailsRow>
{
type === 'buy'
? <Text size='13px' weight={300}><FormattedMessage id='orderdetails.totalcost' defaultMessage='Total Cost' /></Text>
: <Text size='13px' weight={300}><FormattedMessage id='orderdetails.totaltobereceived' defaultMessage='Total to be Received' /></Text>
}
<Text size='13px' weight={300} color='success'>{quoteR.map(quote => reviewOrder.renderTotal(quote, type)).getOrElse('~')}</Text>
</OrderDetailsRow>
>>>>>>>
<OrderDetailsRow>
{
type === 'buy'
? <Text size='13px' weight={300}><FormattedMessage id='orderdetails.amounttopurchase' defaultMessage='BTC Amount to Purchase' /></Text>
: <Text size='13px' weight={300}><FormattedMessage id='orderdetails.amounttosell' defaultMessage='BTC Amount to Sell' /></Text>
}
<Text size='13px' weight={300}>{quoteR.map(quote => reviewOrder.renderFirstRow(quote, type)).getOrElse('~')}</Text>
</OrderDetailsRow>
<OrderDetailsRow>
<ToolTipWrapper>
<Text size='13px' weight={300}>
<FormattedMessage id='orderdetails.tradingfee' defaultMessage='Trading Fee' />
</Text>
<Tooltip>
<FormattedMessage id='orderdetails.tradingfee.tooltip' defaultMessage='The fee charged to execute a trade through SFOX.' />
</Tooltip>
</ToolTipWrapper>
<Text size='13px' weight={300}>{quoteR.map(quote => `$${(+quote.feeAmount).toFixed(2)}`).getOrElse('~')}</Text>
</OrderDetailsRow>
<OrderDetailsRow>
{
type === 'buy'
? <Text size='13px' weight={300}><FormattedMessage id='orderdetails.totalcost' defaultMessage='Total Cost' /></Text>
: <Text size='13px' weight={300}><FormattedMessage id='orderdetails.totaltobereceived' defaultMessage='Total to be Received' /></Text>
}
<Text size='13px' weight={300} color='success'>{quoteR.map(quote => reviewOrder.renderTotal(quote, type)).getOrElse('~')}</Text>
</OrderDetailsRow> |
<<<<<<<
<Link href='https://blockchain.info' size='14px' color='white' uppercase>
<FormattedMessage id='layouts.public.footer.explorer' defaultMessage='Data' />
=======
<Link href='https://blockchain.info' size='12px' weight={300} color='white' uppercase>
<FormattedMessage id='layouts.public.footer.explorer' defaultMessage='.Info Explorer' />
>>>>>>>
<Link href='https://blockchain.info' size='12px' weight={300} color='white' uppercase>
<FormattedMessage id='layouts.public.footer.explorer' defaultMessage='Data' /> |
<<<<<<<
import { compose, curry, equals, filter, head, path, reverse } from 'ramda'
=======
import { compose, curry, filter, head, path, reverse, contains } from 'ramda'
>>>>>>>
import { compose, curry, equals, filter, head, path, reverse, contains } from 'ramda'
<<<<<<<
.map(compose(head, filter(x => equals(path(['quote', 'deposit'], x), address)))))
=======
.map(compose(head, filter(x => path(['quote', 'deposit'], x) === address))))
export const getShapeshiftTxHashMatch = (state, hash) => getMetadata(state).map(data => {
const trades = getTrades(state).getOrElse([])
const tradesHashIn = trades.map(t => t.hashIn)
const tradesHashOut = trades.map(t => t.hashOut)
const hasHashInLabel = contains(hash, tradesHashIn)
const hasHashOutLabel = contains(hash, tradesHashOut)
if (hasHashInLabel || hasHashOutLabel) return 'shift'
return null
}).getOrElse(false)
>>>>>>>
.map(compose(head, filter(x => equals(path(['quote', 'deposit'], x), address)))))
export const getShapeshiftTxHashMatch = (state, hash) => getMetadata(state).map(data => {
const trades = getTrades(state).getOrElse([])
const tradesHashIn = trades.map(t => t.hashIn)
const tradesHashOut = trades.map(t => t.hashOut)
const hasHashInLabel = contains(hash, tradesHashIn)
const hasHashOutLabel = contains(hash, tradesHashOut)
if (hasHashInLabel || hasHashOutLabel) return 'shift'
return null
}).getOrElse(false) |
<<<<<<<
const updateLoggingLevel = (guid, sharedKey, loggingLevel) => updateSettings(guid, sharedKey, 'update-logging-level', loggingLevel)
const updateIpLock = (guid, sharedKey, ipLock) => updateSettings(guid, sharedKey, 'update-ip-lock', ipLock)
const updateIpLockOn = (guid, sharedKey, ipLockOn) => updateSettings(guid, sharedKey, 'update-ip-lock-on', ipLockOn)
const updateBlockTorIps = (guid, sharedKey, blockTorIps) => updateSettings(guid, sharedKey, 'update-block-tor-ips', blockTorIps)
=======
const updateHint = (guid, sharedKey, hint) => updateSettings(guid, sharedKey, 'update-password-hint1', hint)
>>>>>>>
const updateLoggingLevel = (guid, sharedKey, loggingLevel) => updateSettings(guid, sharedKey, 'update-logging-level', loggingLevel)
const updateIpLock = (guid, sharedKey, ipLock) => updateSettings(guid, sharedKey, 'update-ip-lock', ipLock)
const updateIpLockOn = (guid, sharedKey, ipLockOn) => updateSettings(guid, sharedKey, 'update-ip-lock-on', ipLockOn)
const updateBlockTorIps = (guid, sharedKey, blockTorIps) => updateSettings(guid, sharedKey, 'update-block-tor-ips', blockTorIps)
const updateHint = (guid, sharedKey, hint) => updateSettings(guid, sharedKey, 'update-password-hint1', hint)
<<<<<<<
updateAutoLogout: future(updateAutoLogout),
updateLoggingLevel: future(updateLoggingLevel),
updateIpLock: future(updateIpLock),
updateIpLockOn: future(updateIpLockOn),
updateBlockTorIps: future(updateBlockTorIps)
=======
updateAutoLogout: future(updateAutoLogout),
updateHint: future(updateHint)
>>>>>>>
updateAutoLogout: future(updateAutoLogout),
updateLoggingLevel: future(updateLoggingLevel),
updateIpLock: future(updateIpLock),
updateIpLockOn: future(updateIpLockOn),
updateBlockTorIps: future(updateBlockTorIps)
updateHint: future(updateHint) |
<<<<<<<
handleFocus () {
this.setState({ expanded: true })
if (this.props.onFocus) {
this.props.onFocus()
}
}
handleMouseEnter (index) {
this.setState({ hovered: index })
}
handleKeyDown (e, max, item) {
switch (e.key) {
case 'ArrowUp':
this.setState({
hovered: this.state.hovered === 0 ? 0 : this.state.hovered - 1
})
break
case 'ArrowDown':
this.setState({
hovered: this.state.hovered === max ? max : this.state.hovered + 1
})
break
case 'Enter':
this.handleClick(item)
}
}
handleClickOutside () {
if (this.props.onBlur && this.state.expanded) {
this.props.onBlur()
}
this.setState({ expanded: false, search: '' })
}
=======
>>>>>>> |
<<<<<<<
case AT.CLEAR_BCH_TRANSACTION_HISTORY: {
return assoc('transaction_history', Remote.NotAsked, state)
}
=======
case AT.FETCH_BCH_SPENDABLE_BALANCE_LOADING: {
return state
}
case AT.FETCH_BCH_SPENDABLE_BALANCE_SUCCESS: {
return assoc('spendable_balance', Remote.Success(payload), state)
}
case AT.FETCH_BCH_SPENDABLE_BALANCE_FAILURE: {
return assoc('spendable_balance', Remote.Failure(payload), state)
}
case AT.FETCH_BCH_UNSPENDABLE_BALANCE_LOADING: {
return state
}
case AT.FETCH_BCH_UNSPENDABLE_BALANCE_SUCCESS: {
return assoc('unspendable_balance', Remote.Success(payload), state)
}
case AT.FETCH_BCH_UNSPENDABLE_BALANCE_FAILURE: {
return assoc('unspendable_balance', Remote.Failure(payload), state)
}
>>>>>>>
case AT.CLEAR_BCH_TRANSACTION_HISTORY: {
return assoc('transaction_history', Remote.NotAsked, state)
case AT.FETCH_BCH_SPENDABLE_BALANCE_LOADING: {
return state
}
case AT.FETCH_BCH_SPENDABLE_BALANCE_SUCCESS: {
return assoc('spendable_balance', Remote.Success(payload), state)
}
case AT.FETCH_BCH_SPENDABLE_BALANCE_FAILURE: {
return assoc('spendable_balance', Remote.Failure(payload), state)
}
case AT.FETCH_BCH_UNSPENDABLE_BALANCE_LOADING: {
return state
}
case AT.FETCH_BCH_UNSPENDABLE_BALANCE_SUCCESS: {
return assoc('unspendable_balance', Remote.Success(payload), state)
}
case AT.FETCH_BCH_UNSPENDABLE_BALANCE_FAILURE: {
return assoc('unspendable_balance', Remote.Failure(payload), state)
} |
<<<<<<<
<Icon name='left-arrow' size='20px' color='blue600' cursor />
=======
<Icon name='arrow-left' size='24px' color='brand-secondary' cursor />
>>>>>>>
<Icon name='arrow-left' size='24px' color='blue600' cursor /> |
<<<<<<<
uppercase
data-e2e='sendBtc_continue'
disabled={submitting || invalid || pristine || disableLockboxSend}
=======
disabled={submitting || invalid || pristine}
>>>>>>>
data-e2e='sendBtc_continue'
disabled={submitting || invalid || pristine || disableLockboxSend} |
<<<<<<<
import * as Coin from '../coinSelection/coin'
=======
import { addressToScript } from '../utils/btc'
import * as Coin from '../coinSelection/coin.js'
>>>>>>>
import * as Coin from '../coinSelection/coin'
import { addressToScript } from '../utils/btc' |
<<<<<<<
import simpleBuy from './simpleBuy/sagaRegister'
import transactionReport from './transactionReport/sagaRegister'
=======
>>>>>>>
import simpleBuy from './simpleBuy/sagaRegister'
<<<<<<<
yield fork(simpleBuy({ api, coreSagas, networks }))
yield fork(transactionReport({ coreSagas }))
=======
>>>>>>>
yield fork(simpleBuy({ api, coreSagas, networks })) |
<<<<<<<
yield select(S.getTime)
const start = calculateStart(coin, 'tt')
const scale = calculateScale(coin, '')
yield put(actions.core.data.misc.fetchPriceIndexSeries(coin, currency, start, scale))
=======
const time = yield effects.select(S.getTime)
const start = calculateStart(coin, time)
const scale = calculateScale(coin, time)
yield effects.put(actions.core.data.misc.fetchPriceIndexSeries(coin, currency, start, scale))
>>>>>>>
const time = yield select(S.getTime)
const start = calculateStart(coin, time)
const scale = calculateScale(coin, time)
yield put(actions.core.data.misc.fetchPriceIndexSeries(coin, currency, start, scale)) |
<<<<<<<
persistStore(store, { whitelist: ['session', 'preferences'] })
sagaMiddleware.run(rootSaga, { api, btcSocket, ethSocket, bchSocket, options })
=======
persistStore(store, { whitelist: ['session', 'preferences', 'cache'] })
sagaMiddleware.run(rootSaga, { api, socket, options })
>>>>>>>
persistStore(store, { whitelist: ['session', 'preferences', 'cache'] })
persistStore(store, { whitelist: ['session', 'preferences'] })
sagaMiddleware.run(rootSaga, { api, btcSocket, ethSocket, bchSocket, options }) |
<<<<<<<
<FormattedMessage id='components.txlistitem.watch_only' defaultMessage='Non-Spendable' />
=======
<FormattedMessage id='components.txlistitem.watchonly' defaultMessage='Watch Only' />
>>>>>>>
<FormattedMessage id='components.txlistitem.watchonly' defaultMessage='Non-Spendable' /> |
<<<<<<<
state = { isEditing: false, limitsError: '' }
componentWillReceiveProps (nextProps) {
=======
componentDidUpdate (prevProps) {
>>>>>>>
state = { isEditing: false, limitsError: '' }
componentDidUpdate (prevProps) { |
<<<<<<<
import React from 'react'
=======
import { bindActionCreators } from 'redux'
import { compose } from 'ramda'
>>>>>>>
import React from 'react'
<<<<<<<
import { compose } from 'ramda'
import { bindActionCreators } from 'redux'
import wizardProvider from 'providers/WizardProvider'
import { actions } from '../../data'
import FirstStep from './FirstStep'
import SecondStep from './SecondStep'
=======
import React from 'react'
import { actions } from 'data'
import wizardProvider from 'providers/WizardProvider'
>>>>>>>
import { compose } from 'ramda'
import { bindActionCreators } from 'redux'
import { actions } from 'data'
import wizardProvider from 'providers/WizardProvider' |
<<<<<<<
=======
constructor (props) {
super(props)
this.init = this.init.bind(this)
this.handleSubmit = this.handleSubmit.bind(this)
this.handleRefresh = this.handleRefresh.bind(this)
this.handleOpenLockbox = this.handleOpenLockbox.bind(this)
}
>>>>>>>
<<<<<<<
this.props.modalActions.showModal('RequestBtc', {
lockboxIndex: nextProps.lockboxIndex
})
} else if (equals(prop('coin', x), 'XLM')) {
this.props.modalActions.closeAllModals()
this.props.modalActions.showModal('RequestXlm', {
=======
this.props.modalActions.showModal('RequestBtc', {
>>>>>>>
this.props.modalActions.showModal('RequestBtc', {
lockboxIndex: nextProps.lockboxIndex
})
} else if (equals(prop('coin', x), 'XLM')) {
this.props.modalActions.closeAllModals()
this.props.modalActions.showModal('RequestXlm', { |
<<<<<<<
return count + (count === 1 ? ' 个字' : ' 个字');
});
export default countWords;
=======
return count + (count === 1 ? ' word' : ' words');
});
>>>>>>>
return count + (count === 1 ? ' 个字' : ' 个字');
}); |
<<<<<<<
const fetchMetadataBuySell = function * () {
=======
const createBuysell = function * (kv) {
const newBuysellEntry = {
sfox: {},
coinify: {},
unocoin: {}
}
const newkv = set(KVStoreEntry.value, newBuysellEntry, kv)
yield put(A.createMetadataBuysell(newkv))
}
const fetchMetadataBuysell = function * () {
>>>>>>>
const createBuysell = function * (kv) {
const newBuysellEntry = {
sfox: {},
coinify: {},
unocoin: {}
}
const newkv = set(KVStoreEntry.value, newBuysellEntry, kv)
yield put(A.createMetadataBuysell(newkv))
}
const fetchMetadataBuySell = function * () {
<<<<<<<
yield put(A.fetchMetadataBuySellSuccess(newkv))
=======
if (isNil(newkv.value)) {
yield call(createBuysell, newkv)
} else {
yield put(A.fetchMetadataBuysellSuccess(newkv))
}
>>>>>>>
if (isNil(newkv.value)) {
yield call(createBuysell, newkv)
} else {
yield put(A.fetchMetadataBuySellSuccess(newkv))
} |
<<<<<<<
export const RESET_2FA_ERROR = 'RESET_2FA_ERROR'
export const UPGRADE_WALLET = 'UPGRADE_WALLET'
export const SET_AUTH_ERROR = 'SET_AUTH_ERROR'
export const CLEAR_ERROR = 'CLEAR_ERROR'
=======
export const RESET_2FA_LOADING = 'RESET_2FA_LOADING'
export const RESET_2FA_SUCCESS = 'RESET_2FA_SUCCESS'
export const RESET_2FA_FAILURE = 'RESET_2FA_FAILURE'
export const UPGRADE_WALLET = 'UPGRADE_WALLET'
>>>>>>>
export const RESET_2FA_LOADING = 'RESET_2FA_LOADING'
export const RESET_2FA_SUCCESS = 'RESET_2FA_SUCCESS'
export const RESET_2FA_FAILURE = 'RESET_2FA_FAILURE'
export const UPGRADE_WALLET = 'UPGRADE_WALLET'
export const SET_AUTH_ERROR = 'SET_AUTH_ERROR'
export const CLEAR_ERROR = 'CLEAR_ERROR' |
<<<<<<<
const getReceiveAddressWallet = index =>
=======
const networkR = selectors.core.walletOptions.getBtcNetwork(state)
const network = networkR.getOrElse('bitcoin')
const getReceive = index =>
>>>>>>>
const networkR = selectors.core.walletOptions.getBtcNetwork(state)
const network = networkR.getOrElse('bitcoin')
const getReceiveAddressWallet = index => |
<<<<<<<
this.$.propertiesWidget.activateFileChooser(true);
this.$.propertiesWidget.setTargetProject(target);
this.show();
=======
this.$.propertiesWidget.activateFileChoosers(true);
var show = (function () {
this.show();
}).bind(this);
this.$.propertiesWidget.checkFileChoosers(show);
>>>>>>>
this.$.propertiesWidget.setTargetProject(target);
this.$.propertiesWidget.activateFileChoosers(true);
var show = (function () {
this.show();
}).bind(this);
this.$.propertiesWidget.checkFileChoosers(show); |
<<<<<<<
// addElement(el, removeDuplicates)
return addElement(el, true);
=======
return {
'ctype': 'geo',
'value': addElement(el)
};
>>>>>>>
return {
'ctype': 'geo',
'value': addElement(el, true)
};
<<<<<<<
// addElement(el, removeDuplicates)
return addElement(el, true);
=======
>>>>>>> |
<<<<<<<
return v1;
}
=======
return args[0].value;
};
>>>>>>>
return v1;
};
<<<<<<<
if(v0.ctype=='number' && v1.ctype=='number' ){
=======
if(v0.ctype==='number' && v1.ctype==='number' ){
>>>>>>>
if(v0.ctype==='number' && v1.ctype==='number' ){
<<<<<<<
if(move && move.mover)
return {ctype:"geo",value:move.mover,type:"P"};
else
console.log("Not moving anything at the moment");
}
=======
evaluator.mover$0=function(args,modifs){ //OK
if(move && move.mover)
return {ctype:"geo",value:move.mover,type:"P"};
>>>>>>>
evaluator.mover$0=function(args,modifs){ //OK
if(move && move.mover)
return {ctype:"geo",value:move.mover,type:"P"};
else
console.log("Not moving anything at the moment"); |
<<<<<<<
var eps = 1e-16;
var mat = args.matrix;
=======
var eps = 10e-16;
var mat = aConic.matrix;
>>>>>>>
var eps = 1e-16;
var mat = aConic.matrix; |
<<<<<<<
enyo.forEach(configs, function(config){
this.services.push({
config: config
});
=======
// instanciate active service providers
enyo.forEach(confs, function(conf){
var service = {
conf: conf
};
if (conf.type === "filesystem" && conf.provider === "hermes") {
// hermes type of services use
// a common front-end
service.impl = new HermesFileSystem();
service.impl.notifyFailure = enyo.bind(this, this.serviceFailure, conf.type, conf.id);
service.impl.setConfig(service.conf);
} else if (conf.type === "build" && conf.provider === "hermes" && conf.id === "phonegap") {
service.impl = new PhonegapBuild();
service.impl.setConfig(service.conf);
}
this.services.push(service);
next();
>>>>>>>
enyo.forEach(configs, function(config){
this.services.push({
config: config
});
next(); |
<<<<<<<
};
//
// CONSOLE
//
function setupConsole() {
if (typeof csconsole === "boolean" && csconsole === true) {
csconsole = new CindyConsoleHandler();
} else if (typeof csconsole === "string") {
var id = csconsole;
csconsole = new ElementConsoleHandler(id);
}
// Fallback
if (typeof csconsole === "undefined") {
csconsole = new PopupConsoleHandler();
}
}
function GenericConsoleHandler(args) {
this.in = function(s, preventNewline) {
console.log(s);
if (preventNewline) {
this.append(this.createTextNode("span", "blue", s));
} else {
this.append(this.createTextNode("p", "blue", s));
}
};
this.out = function(s, preventNewline) {
console.log(s);
if (preventNewline) {
this.append(this.createTextNode("span", "red", s));
} else {
this.append(this.createTextNode("p", "red", s));
}
};
this.err = function(s, preventNewline) {
console.log(s);
if (preventNewline) {
this.append(this.createTextNode("span", "red", s));
} else {
this.append(this.createTextNode("p", "red", s));
}
};
this.createTextNode = function(tagName, color, s) {
var element = document.createElement(tagName);
element.appendChild(document.createTextNode(s));
element.style.color = color;
return element;
}
};
function CindyConsoleHandler() {
var that = this;
var cmd;
var container = document.createElement("div");
var log;
container.innerHTML = "<div id=\"console\" style=\"border-top: 1px solid #333333; bottom: 0px; position: absolute; width: 100%;\">"
+ "<div id=\"log\" style=\"height: 150px; overflow-y: auto;\"></div>"
+ "<input id=\"cmd\" type=\"text\" style=\"box-sizing: border-box; height: 30px; width: 100%;\">"
+ "</div>";
document.body.appendChild(container);
cmd = document.getElementById("cmd");
log = document.getElementById("log");
cmd.onkeydown = function(evt) {
if (evt.keyCode !== 13 || cmd.value === "") {
return;
}
that.in(cmd.value);
evalcs(cmd.value);
cmd.value = "";
log.scrollTop = log.scrollHeight;
}
this.append = function(s) {
log.appendChild(s);
};
this.clear = function() {
log.innerHTML = "";
};
};
CindyConsoleHandler.prototype = new GenericConsoleHandler;
function ElementConsoleHandler(id) {
var element = document.getElementById(id);
this.append = function(s) {
element.appendChild(s);
};
this.clear = function() {
element.innerHTML = "";
};
};
ElementConsoleHandler.prototype = new GenericConsoleHandler;
function PopupConsoleHandler() {
var popup = window.open('', '', 'width=200,height=100');
var body;
if (popup) {
body = popup.document.getElementsByTagName("body")[0];
}
this.append = function(s) {
if (body) {
body.appendChild(s);
}
};
this.clear = function() {
if (body) {
body.innerHTML = "";
}
};
};
PopupConsoleHandler.prototype = new GenericConsoleHandler;
=======
};
var startupCalled = false;
var waitForPlugins = 0;
if (instanceInvocationArguments.use) {
instanceInvocationArguments.use.forEach(function(name) {
var cb = null;
if (instanceInvocationArguments.plugins)
cb = instanceInvocationArguments.plugins[name];
if (!cb)
cb = createCindy._pluginRegistry[name];
if (!cb) {
++waitForPlugins;
console.log("Loading script for plugin " + name);
createCindy.loadScript(name + "-plugin", name + "-plugin.js", function() {
console.log("Successfully loaded plugin " + name);
if (--waitForPlugins === 0 && startupCalled) createCindyNow();
}, function() {
console.error("Failed to auto-load plugin " + name);
if (--waitForPlugins === 0 && startupCalled) createCindyNow();
});
}
});
}
>>>>>>>
};
var startupCalled = false;
var waitForPlugins = 0;
if (instanceInvocationArguments.use) {
instanceInvocationArguments.use.forEach(function(name) {
var cb = null;
if (instanceInvocationArguments.plugins)
cb = instanceInvocationArguments.plugins[name];
if (!cb)
cb = createCindy._pluginRegistry[name];
if (!cb) {
++waitForPlugins;
console.log("Loading script for plugin " + name);
createCindy.loadScript(name + "-plugin", name + "-plugin.js", function() {
console.log("Successfully loaded plugin " + name);
if (--waitForPlugins === 0 && startupCalled) createCindyNow();
}, function() {
console.error("Failed to auto-load plugin " + name);
if (--waitForPlugins === 0 && startupCalled) createCindyNow();
});
}
});
}
//
// CONSOLE
//
function setupConsole() {
if (typeof csconsole === "boolean" && csconsole === true) {
csconsole = new CindyConsoleHandler();
} else if (typeof csconsole === "string") {
var id = csconsole;
csconsole = new ElementConsoleHandler(id);
}
// Fallback
if (typeof csconsole === "undefined") {
csconsole = new PopupConsoleHandler();
}
}
function GenericConsoleHandler(args) {
this.in = function(s, preventNewline) {
console.log(s);
if (preventNewline) {
this.append(this.createTextNode("span", "blue", s));
} else {
this.append(this.createTextNode("p", "blue", s));
}
};
this.out = function(s, preventNewline) {
console.log(s);
if (preventNewline) {
this.append(this.createTextNode("span", "red", s));
} else {
this.append(this.createTextNode("p", "red", s));
}
};
this.err = function(s, preventNewline) {
console.log(s);
if (preventNewline) {
this.append(this.createTextNode("span", "red", s));
} else {
this.append(this.createTextNode("p", "red", s));
}
};
this.createTextNode = function(tagName, color, s) {
var element = document.createElement(tagName);
element.appendChild(document.createTextNode(s));
element.style.color = color;
return element;
}
};
function CindyConsoleHandler() {
var that = this;
var cmd;
var container = document.createElement("div");
var log;
container.innerHTML = "<div id=\"console\" style=\"border-top: 1px solid #333333; bottom: 0px; position: absolute; width: 100%;\">"
+ "<div id=\"log\" style=\"height: 150px; overflow-y: auto;\"></div>"
+ "<input id=\"cmd\" type=\"text\" style=\"box-sizing: border-box; height: 30px; width: 100%;\">"
+ "</div>";
document.body.appendChild(container);
cmd = document.getElementById("cmd");
log = document.getElementById("log");
cmd.onkeydown = function(evt) {
if (evt.keyCode !== 13 || cmd.value === "") {
return;
}
that.in(cmd.value);
evalcs(cmd.value);
cmd.value = "";
log.scrollTop = log.scrollHeight;
}
this.append = function(s) {
log.appendChild(s);
};
this.clear = function() {
log.innerHTML = "";
};
};
CindyConsoleHandler.prototype = new GenericConsoleHandler;
function ElementConsoleHandler(id) {
var element = document.getElementById(id);
this.append = function(s) {
element.appendChild(s);
};
this.clear = function() {
element.innerHTML = "";
};
};
ElementConsoleHandler.prototype = new GenericConsoleHandler;
function PopupConsoleHandler() {
var popup = window.open('', '', 'width=200,height=100');
var body;
if (popup) {
body = popup.document.getElementsByTagName("body")[0];
}
this.append = function(s) {
if (body) {
body.appendChild(s);
}
};
this.clear = function() {
if (body) {
body.innerHTML = "";
}
};
};
PopupConsoleHandler.prototype = new GenericConsoleHandler; |
<<<<<<<
el.size = CSNumber.real(el.size ? +el.size : defaultAppearance.textsize);
if (el.pos) el.homog = geoOps._helper.initializePoint(el);
=======
if (el.pos) el.pos = geoOps._helper.initializePoint(el);
>>>>>>>
if (el.pos) el.homog = geoOps._helper.initializePoint(el); |
<<<<<<<
* @param {td.EventManager=} addEventListener
=======
* @param {Object} opts options for context creation
>>>>>>>
* @param {Object} opts options for context creation
* @param {td.EventManager=} addEventListener
<<<<<<<
function Viewer(name, addEventListener) {
=======
function Viewer(name, opts) {
>>>>>>>
function Viewer(name, opts, addEventListener) { |
<<<<<<<
onCloseFileRequest: ""
=======
onClose: "",
onSave: "",
onNewKind: "",
onDesign: "",
onRegisterMe: ""
>>>>>>>
onCloseFileRequest: "",
onDesign: "",
onRegisterMe: ""
<<<<<<<
{kind: "onyx.Grabber", ontap: "doToggleOpen"},
{
name: "tabs",
kind: "onyx.TabBar",
showing: false,
checkBeforeClosing: true,
onTabChanged: 'switchFile',
onTabRemoveRequested: 'requestCloseFile'
}
=======
{name: "container", classes: "ares-docbar-container", kind: "FittableColumns", ontap: "doToggleOpen", components: [
{kind: "onyx.Grabber", classes: "ares-grabber"},
{kind: "onyx.Drawer", orient: "h", open: false, showing:false, components: [
{kind: "FittableColumns", components: [
{kind: "onyx.Button", content: "Save", ontap: "saveFile"},
{kind: "onyx.Button", content: "New Kind", ontap: "newKind"},
{name: "designButton", kind: "onyx.Button", content: "Designer", ontap: "designFile"}
]}
]},
{name: "tabs", classes: "ares-docbar-tabs", kind: "onyx.RadioGroup"}
]}
>>>>>>>
{kind: "onyx.Grabber", ontap: "doToggleOpen", classes: "ares-grabber"},
{
name: "tabs",
kind: "onyx.TabBar",
showing: false,
checkBeforeClosing: true,
onTabChanged: 'switchFile',
onTabRemoveRequested: 'requestCloseFile'
}
<<<<<<<
=======
tabs: {},
create: function() {
this.inherited(arguments);
var self = this;
this.doRegisterMe({name:"documentToolbar", reference:self});
},
showControls: function() {
this.$.drawer.setOpen(true);
// lock designButton's width, so it doesn't move when the caption changes
var w = this.$.designButton.getBounds().width;
this.$.designButton.setBounds({width: w});
},
hideControls: function() {
this.$.drawer.setOpen(false);
},
>>>>>>>
create: function() {
this.inherited(arguments);
var self = this;
this.doRegisterMe({name:"documentToolbar", reference:self});
}, |
<<<<<<<
var ifs = null;
geoOps.IFS = {};
geoOps.IFS.kind = "IFS";
geoOps.IFS.signature = "**"; // (Tr|Mt)*
geoOps.IFS.signatureConstraints = function(el) {
for (var i = 0; i < el.args.length; ++i) {
var kind = csgeo.csnames[el.args[i]].kind;
if (kind !== "Tr" && kind !== "Mt")
return false;
}
return el.args.length > 0;
};
geoOps.IFS.initialize = function(el) {
if (ifs) {
ifs.dirty = true;
return;
}
var baseDir = CindyJS.getBaseDir();
if (baseDir === false)
return;
ifs = {
dirty: false,
params: {
generation: 0
},
};
var worker = ifs.worker = new Worker(baseDir + "ifs.js");
worker.onmessage = function(msg) {
if (ifs.img && typeof ifs.img.close === "function")
ifs.img.close();
if (isShutDown) return;
var d = msg.data;
if (d.generation === ifs.params.generation) {
if (d.buffer) {
if (!ifs.canvas) {
ifs.canvas = document.createElement("canvas");
ifs.ctx = ifs.canvas.getContext("2d");
}
ifs.canvas.width = d.width;
ifs.canvas.height = d.height;
var imgSize = d.width * d.height * 4;
var imgBytes = new Uint8ClampedArray(
d.buffer, d.imgPtr, imgSize);
var imgData = new ImageData(imgBytes, d.width, d.height);
ifs.ctx.putImageData(imgData, 0, 0);
ifs.img = ifs.canvas;
} else {
ifs.img = d.img;
}
scheduleUpdate();
} else {
ifs.img = null;
}
if (d.buffer) {
worker.postMessage({
cmd: "next",
buffer: d.buffer
}, [d.buffer]);
} else {
worker.postMessage({
cmd: "next",
});
}
};
shutdownHooks.push(worker.terminate.bind(worker));
};
geoOps.IFS.updatePosition = function(el) {
ifs.dirty = true;
};
geoOps.IFS.updateParameters = function() {
if (!ifs.worker)
return; // no worker, nothing we can do
var supersampling = 4;
var msg = {
cmd: "init",
generation: ifs.params.generation,
width: csw * supersampling,
height: csh * supersampling
};
msg.systems = csgeo.ifs.map(function(el) {
var sum = 0;
var i;
var params = el.ifs || [];
var trs = el.args.map(function(name, i) {
var p = params[i] || {};
return {
prob: p.prob || 1,
color: p.color || [0, 0, 0]
};
});
for (i = 0; i < trs.length; ++i)
sum += trs[i].prob;
var scale = List.realMatrix([
[1, 0, 0],
[0, 1, 0],
[0, 0, supersampling]
]);
var px2hom = List.productMM(csport.toMat(), scale);
for (i = 0; i < el.args.length; ++i) {
var trel = csgeo.csnames[el.args[i]];
var kind = trel.kind;
var tr = trs[i];
tr.kind = kind;
tr.prob /= sum;
if (kind === "Tr") {
var mat = List.normalizeMax(List.productMM(
List.adjoint3(px2hom),
List.productMM(trel.matrix, px2hom)));
if (!List._helper.isAlmostReal(mat)) {
tr.kind = "cplx";
continue;
}
tr.mat = mat.value.map(function(row) {
return row.value.map(function(entry) {
return entry.value.real;
});
});
} else if (kind === "Mt") {
// drawingstate matrix as a Möbius transformation
// from homogeneous coordinates to pixels
var view = csport.drawingstate.matrix;
view = {
anti: view.det > 0,
ar: CSNumber.real(view.a),
ai: CSNumber.real(view.c),
br: CSNumber.real(view.tx),
bi: CSNumber.real(-view.ty),
cr: CSNumber.zero,
ci: CSNumber.zero,
dr: CSNumber.real(1 / supersampling),
di: CSNumber.zero
};
// now compose view * trel * view^{-1}
var elLike = {};
geoOps._helper.composeMtMt(elLike, trel.moebius, view);
view = geoOps._helper.inverseMoebius(view);
geoOps._helper.composeMtMt(elLike, view, elLike.moebius);
var moeb = elLike.moebius;
moeb = List.turnIntoCSList([
moeb.ar,
moeb.ai,
moeb.br,
moeb.bi,
moeb.cr,
moeb.ci,
moeb.dr,
moeb.di
]);
if (!List._helper.isAlmostReal(moeb)) {
tr.kind = "cplx";
continue;
}
moeb = moeb.value;
tr.moebius = {
ar: moeb[0].value.real,
ai: moeb[1].value.real,
br: moeb[2].value.real,
bi: moeb[3].value.real,
cr: moeb[4].value.real,
ci: moeb[5].value.real,
dr: moeb[6].value.real,
di: moeb[7].value.real,
sign: trel.moebius.anti ? -1 : 1
};
}
}
return {
trafos: trs
};
});
if (General.deeplyEqual(msg, ifs.params)) {
// console.log("IFS not modified");
return;
}
++msg.generation;
ifs.img = null;
ifs.params = msg;
ifs.mat = csport.drawingstate.matrix;
// console.log(msg);
ifs.worker.postMessage(msg);
};
geoOps.IFS.probSetter = function(i, el, value) {
if (value.ctype === "number") {
el.ifs[i].prob = value.value.real;
ifs.dirty = true;
}
};
(function() {
for (var i = 0; i < 10; ++i)
geoOps.IFS["set_prob" + i] = geoOps.IFS.probSetter.bind(null, i);
})();
=======
geoOps._helper.snapPointToLine = function(pos, line) {
// fail safe for far points
if (CSNumber._helper.isAlmostZero(pos.value[2])) return pos;
// project point to line - useful for semi free elements
var projPos = geoOps._helper.projectPointToLine(pos, line);
projPos = List.normalizeZ(projPos);
var sx = projPos.value[0].value.real;
var sy = projPos.value[1].value.real;
var rx = Math.round(sx / csgridsize) * csgridsize;
var ry = Math.round(sy / csgridsize) * csgridsize;
var newpos = List.realVector([rx, ry, 1]);
if (Math.abs(rx - sx) < 0.2 && Math.abs(ry - sy) < 0.2 &&
CSNumber._helper.isAlmostZero(List.scalproduct(line, newpos))) {
pos = geoOps._helper.projectPointToLine(newpos, line);
}
return pos;
};
>>>>>>>
var ifs = null;
geoOps.IFS = {};
geoOps.IFS.kind = "IFS";
geoOps.IFS.signature = "**"; // (Tr|Mt)*
geoOps.IFS.signatureConstraints = function(el) {
for (var i = 0; i < el.args.length; ++i) {
var kind = csgeo.csnames[el.args[i]].kind;
if (kind !== "Tr" && kind !== "Mt")
return false;
}
return el.args.length > 0;
};
geoOps.IFS.initialize = function(el) {
if (ifs) {
ifs.dirty = true;
return;
}
var baseDir = CindyJS.getBaseDir();
if (baseDir === false)
return;
ifs = {
dirty: false,
params: {
generation: 0
},
};
var worker = ifs.worker = new Worker(baseDir + "ifs.js");
worker.onmessage = function(msg) {
if (ifs.img && typeof ifs.img.close === "function")
ifs.img.close();
if (isShutDown) return;
var d = msg.data;
if (d.generation === ifs.params.generation) {
if (d.buffer) {
if (!ifs.canvas) {
ifs.canvas = document.createElement("canvas");
ifs.ctx = ifs.canvas.getContext("2d");
}
ifs.canvas.width = d.width;
ifs.canvas.height = d.height;
var imgSize = d.width * d.height * 4;
var imgBytes = new Uint8ClampedArray(
d.buffer, d.imgPtr, imgSize);
var imgData = new ImageData(imgBytes, d.width, d.height);
ifs.ctx.putImageData(imgData, 0, 0);
ifs.img = ifs.canvas;
} else {
ifs.img = d.img;
}
scheduleUpdate();
} else {
ifs.img = null;
}
if (d.buffer) {
worker.postMessage({
cmd: "next",
buffer: d.buffer
}, [d.buffer]);
} else {
worker.postMessage({
cmd: "next",
});
}
};
shutdownHooks.push(worker.terminate.bind(worker));
};
geoOps.IFS.updatePosition = function(el) {
ifs.dirty = true;
};
geoOps.IFS.updateParameters = function() {
if (!ifs.worker)
return; // no worker, nothing we can do
var supersampling = 4;
var msg = {
cmd: "init",
generation: ifs.params.generation,
width: csw * supersampling,
height: csh * supersampling
};
msg.systems = csgeo.ifs.map(function(el) {
var sum = 0;
var i;
var params = el.ifs || [];
var trs = el.args.map(function(name, i) {
var p = params[i] || {};
return {
prob: p.prob || 1,
color: p.color || [0, 0, 0]
};
});
for (i = 0; i < trs.length; ++i)
sum += trs[i].prob;
var scale = List.realMatrix([
[1, 0, 0],
[0, 1, 0],
[0, 0, supersampling]
]);
var px2hom = List.productMM(csport.toMat(), scale);
for (i = 0; i < el.args.length; ++i) {
var trel = csgeo.csnames[el.args[i]];
var kind = trel.kind;
var tr = trs[i];
tr.kind = kind;
tr.prob /= sum;
if (kind === "Tr") {
var mat = List.normalizeMax(List.productMM(
List.adjoint3(px2hom),
List.productMM(trel.matrix, px2hom)));
if (!List._helper.isAlmostReal(mat)) {
tr.kind = "cplx";
continue;
}
tr.mat = mat.value.map(function(row) {
return row.value.map(function(entry) {
return entry.value.real;
});
});
} else if (kind === "Mt") {
// drawingstate matrix as a Möbius transformation
// from homogeneous coordinates to pixels
var view = csport.drawingstate.matrix;
view = {
anti: view.det > 0,
ar: CSNumber.real(view.a),
ai: CSNumber.real(view.c),
br: CSNumber.real(view.tx),
bi: CSNumber.real(-view.ty),
cr: CSNumber.zero,
ci: CSNumber.zero,
dr: CSNumber.real(1 / supersampling),
di: CSNumber.zero
};
// now compose view * trel * view^{-1}
var elLike = {};
geoOps._helper.composeMtMt(elLike, trel.moebius, view);
view = geoOps._helper.inverseMoebius(view);
geoOps._helper.composeMtMt(elLike, view, elLike.moebius);
var moeb = elLike.moebius;
moeb = List.turnIntoCSList([
moeb.ar,
moeb.ai,
moeb.br,
moeb.bi,
moeb.cr,
moeb.ci,
moeb.dr,
moeb.di
]);
if (!List._helper.isAlmostReal(moeb)) {
tr.kind = "cplx";
continue;
}
moeb = moeb.value;
tr.moebius = {
ar: moeb[0].value.real,
ai: moeb[1].value.real,
br: moeb[2].value.real,
bi: moeb[3].value.real,
cr: moeb[4].value.real,
ci: moeb[5].value.real,
dr: moeb[6].value.real,
di: moeb[7].value.real,
sign: trel.moebius.anti ? -1 : 1
};
}
}
return {
trafos: trs
};
});
if (General.deeplyEqual(msg, ifs.params)) {
// console.log("IFS not modified");
return;
}
++msg.generation;
ifs.img = null;
ifs.params = msg;
ifs.mat = csport.drawingstate.matrix;
// console.log(msg);
ifs.worker.postMessage(msg);
};
geoOps.IFS.probSetter = function(i, el, value) {
if (value.ctype === "number") {
el.ifs[i].prob = value.value.real;
ifs.dirty = true;
}
};
(function() {
for (var i = 0; i < 10; ++i)
geoOps.IFS["set_prob" + i] = geoOps.IFS.probSetter.bind(null, i);
})();
geoOps._helper.snapPointToLine = function(pos, line) {
// fail safe for far points
if (CSNumber._helper.isAlmostZero(pos.value[2])) return pos;
// project point to line - useful for semi free elements
var projPos = geoOps._helper.projectPointToLine(pos, line);
projPos = List.normalizeZ(projPos);
var sx = projPos.value[0].value.real;
var sy = projPos.value[1].value.real;
var rx = Math.round(sx / csgridsize) * csgridsize;
var ry = Math.round(sy / csgridsize) * csgridsize;
var newpos = List.realVector([rx, ry, 1]);
if (Math.abs(rx - sx) < 0.2 && Math.abs(ry - sy) < 0.2 &&
CSNumber._helper.isAlmostZero(List.scalproduct(line, newpos))) {
pos = geoOps._helper.projectPointToLine(newpos, line);
}
return pos;
}; |
<<<<<<<
return (index && (index[query] || index[query[this.mainIndex]])) || this._indexes.cid[query.cid];
=======
return index[query] || index[query[this.mainIndex]] || this._indexes.cid[query] || this._indexes.cid[query.cid];
>>>>>>>
return (index && (index[query] || index[query[this.mainIndex]])) || this._indexes.cid[query] || this._indexes.cid[query.cid]; |
<<<<<<<
orientation="left"
type="number"
axisLine={false}
tickLine={false}
interval="preserveStartEnd"
/>
<YAxis
orientation="right"
type="number"
=======
/*dataKey="volume"*/
>>>>>>>
orientation="left"
type="number"
axisLine={false}
tickLine={false}
interval="preserveStartEnd"
/>
<YAxis
orientation="right"
type="number"
<<<<<<<
<Line
hide={eth}
type="monotone"
dataKey="ethLiquidity"
stroke="var(--c-uniswappink)"
/>
<Line
=======
{<Line
>>>>>>>
<Line
<<<<<<<
/>
<Line
=======
/>}
{<Line
>>>>>>>
/>
<Line
<<<<<<<
/>
=======
/>}
{<Line
hide={eth}
type="monotone"
dataKey="ethLiquidity"
stroke="var(--c-uniswappink)"
/>}
>>>>>>>
/>}
<Line
hide={eth}
type="monotone"
dataKey="ethLiquidity"
stroke="var(--c-uniswappink)"
/> |
<<<<<<<
{
model: ['9290012607', '9290019758'],
note: `
### Motion sensitivity
The motion sensitivity can be changed by publishing to \`zigbee2mqtt/[DEVICE_ID]/set\`
\`{"motion_sensitivity": "SENSITIVITY"}\` where \`SENSITVITIY\` is one of the following
values: \`low\`, \`medium\`, \`high\` (default).
`,
},
=======
{
model: ['CC2530.ROUTER'],
note: `
### Pairing
At first boot it will automatically be in pairing mode and join your network.
To reset it into pairing mode power-cycle it three times as follows:
1) power on
2) wait 2sec
3) power off
4) repeat above steps 2 further times
5) power on and wait for it to join your network
`,
},
{
model: ['IM6001-MPP01'],
note: `
### Pairing
When pairing, make sure to keep the sensor awake for 20 seconds by openinig and closing the contact
every second.
`,
},
{
model: ['SJCGQ11LM'],
note: `
### Pairing
Press and hold water logo on the device for +- 10 seconds until the blue light blinks
three times, release the water logo (the blue light will blink once more) and wait.
`,
},
>>>>>>>
{
model: ['9290012607', '9290019758'],
note: `
### Motion sensitivity
The motion sensitivity can be changed by publishing to \`zigbee2mqtt/[DEVICE_ID]/set\`
\`{"motion_sensitivity": "SENSITIVITY"}\` where \`SENSITVITIY\` is one of the following
values: \`low\`, \`medium\`, \`high\` (default).
`,
},
{
model: ['CC2530.ROUTER'],
note: `
### Pairing
At first boot it will automatically be in pairing mode and join your network.
To reset it into pairing mode power-cycle it three times as follows:
1) power on
2) wait 2sec
3) power off
4) repeat above steps 2 further times
5) power on and wait for it to join your network
`,
},
{
model: ['IM6001-MPP01'],
note: `
### Pairing
When pairing, make sure to keep the sensor awake for 20 seconds by openinig and closing the contact
every second.
`,
},
{
model: ['SJCGQ11LM'],
note: `
### Pairing
Press and hold water logo on the device for +- 10 seconds until the blue light blinks
three times, release the water logo (the blue light will blink once more) and wait.
`,
}, |
<<<<<<<
this.trace("Post ARES.TEST.RUNNING ... ", JSON.stringify(obj));
=======
if (this.debug) {
enyo.log("Post ARES.TEST.RUNNING ... ", enyo.json.stringify(obj));
}
>>>>>>>
this.trace("Post ARES.TEST.RUNNING ... ", JSON.stringify(obj));
<<<<<<<
this.trace("Post ARES.TEST.RESULT ... ", JSON.stringify(obj));
=======
if (this.debug) {
enyo.log("Post ARES.TEST.RESULT ... ", enyo.json.stringify(obj));
}
>>>>>>>
this.trace("Post ARES.TEST.RESULT ... ", JSON.stringify(obj));
enyo.log("Post ARES.TEST.RESULT ... ", enyo.json.stringify(obj)); |
<<<<<<<
var Vote = require('../models/Vote');
=======
var request = require('request');
>>>>>>>
var Vote = require('../models/Vote');
var request = require('request'); |
<<<<<<<
'LeandroLovisolo',
'euank',
'humd',
'bwlang',
'barretts',
'pksjce',
'tito0224',
'hemanth',
'treygriffith',
=======
'shedd',
>>>>>>>
'shedd',
'LeandroLovisolo',
'euank',
'humd',
'bwlang',
'barretts',
'pksjce',
'tito0224',
'hemanth',
'treygriffith', |
<<<<<<<
app.post('/news/:id/comments', passportConf.isAuthenticated, newsController.postComment);
=======
app.post('/news/:id/comments', newsController.postComment);
app.post('/news/:id/comments/:comment_id/delete', newsController.deleteComment);
>>>>>>>
app.post('/news/:id/comments', passportConf.isAuthenticated, newsController.postComment);
app.post('/news/:id/comments/:comment_id/delete', passportConf.isAuthenticated, newsController.deleteComment); |
<<<<<<<
'qguv',
=======
'briansoule',
>>>>>>>
'briansoule',
'qguv', |
<<<<<<<
'briansoule',
'qguv',
=======
'kennethrapp',
>>>>>>>
'kennethrapp',
'briansoule',
'qguv',
<<<<<<<
'treygriffith',
'megamattron',
'pents90',
'michaelnovakjr',
'markbao',
'kalmi',
'lablayers',
'dfjones'
]
=======
'treygriffith',
'megamattron',
'pents90',
'michaelnovakjr',
'markbao',
'kalmi',
'lablayers'
]
>>>>>>>
'treygriffith',
'megamattron',
'pents90',
'michaelnovakjr',
'markbao',
'kalmi',
'lablayers',
'dfjones'
] |
<<<<<<<
users: [ // ADD YOUR USERNAME IN ITS ALPHABETICAL SLOT
'barretts',
=======
users: [ // ADD YOUR USERNAME AT THE TOP
'avaynshtok',
'gwillen',
'isaaczafuta',
>>>>>>>
users: [ // ADD YOUR USERNAME IN ITS ALPHABETICAL SLOT
'avaynshtok',
'barretts', |
<<<<<<<
$('form').submit(function(ev) {
$(this).append(
'<input type="hidden" name="windowscrolly" value="' + window.scrollY + '">'
);
});
window.scrollTo(0, $('input[name="windowscrollto"]').val() || 0);
=======
if ($('form.upvote-form').length > 0) {
$('.upvote-form').on('submit', function (e) {
var form = $(this);
$.post(form.attr('action'), form.serialize())
.done(function (data) {
if (data.messages) {
var builder = new FlashBuilder(data.success ? 'success' : 'error', data.messages);
builder.build();
}
if (data.success) {
$('button.upvote', form).remove();
}
})
.fail(function (data) {
var builder = new FlashBuilder('error', [{ msg: 'Something went wrong!'}]);
});
e.preventDefault();
});
}
>>>>>>>
$('form').submit(function(ev) {
$(this).append(
'<input type="hidden" name="windowscrolly" value="' + window.scrollY + '">'
);
});
if ($('form.upvote-form').length > 0) {
$('.upvote-form').on('submit', function (e) {
var form = $(this);
$.post(form.attr('action'), form.serialize())
.done(function (data) {
if (data.messages) {
var builder = new FlashBuilder(data.success ? 'success' : 'error', data.messages);
builder.build();
}
if (data.success) {
$('button.upvote', form).remove();
}
})
.fail(function (data) {
var builder = new FlashBuilder('error', [{ msg: 'Something went wrong!'}]);
});
e.preventDefault();
});
}
window.scrollTo(0, $('input[name="windowscrollto"]').val() || 0); |
<<<<<<<
'gnumanth',
'treygriffith',
=======
'tito0224',
>>>>>>>
'tito0224',
'gnumanth',
'treygriffith', |
<<<<<<<
useNativeDriver: ?boolean,
=======
headerContainerStyle?: ?Object,
disableHeaderGrow?: ?boolean,
disableOverlay?: ?boolean,
>>>>>>>
useNativeDriver: ?boolean,
headerContainerStyle?: ?Object,
disableHeaderGrow?: ?boolean,
disableOverlay?: ?boolean,
<<<<<<<
useNativeDriver,
=======
getScrollViewRef,
>>>>>>>
useNativeDriver,
getScrollViewRef,
<<<<<<<
ref={ref => (this.scrollViewRef = ref)}
scrollEventThrottle={useNativeDriver ? 1 : 16}
=======
ref={ref => {
if (getScrollViewRef) {
getScrollViewRef(ref);
}
this.scrollViewRef = ref;
}}
scrollEventThrottle={16}
>>>>>>>
scrollEventThrottle={useNativeDriver ? 1 : 16}
ref={ref => {
if (getScrollViewRef) {
getScrollViewRef(ref);
}
this.scrollViewRef = ref;
}} |
<<<<<<<
var oldSelection = this.editor.getDomSelection();
=======
var oldSelection = this.editor.getSelection();
var previous = this.previousField || '';
>>>>>>>
var oldSelection = this.editor.getDomSelection();
var previous = this.previousField || ''; |
<<<<<<<
function buildAxisLabels() {
//build axis labels
var axislabelhtml = "";
var xcoords = toScreenXY(new THREE.Vector3(g_xMaximumValue, g_yMinimumValue, g_zMinimumValue),g_sceneCamera,$('#main_plot'));
axislabelhtml += "<label id=\"pc1_label\" class=\"unselectable labels\" style=\"position:absolute; left:"+parseInt(xcoords['x'])+"px; top:"+parseInt(xcoords['y'])+"px;\">";
axislabelhtml += g_pc1Label;
axislabelhtml += "</label>";
var ycoords = toScreenXY(new THREE.Vector3(g_xMinimumValue, g_yMaximumValue, g_zMinimumValue),g_sceneCamera,$('#main_plot'));
axislabelhtml += "<label id=\"pc2_label\" class=\"unselectable labels\" style=\"position:absolute; left:"+parseInt(ycoords['x'])+"px; top:"+parseInt(ycoords['y'])+"px;\">";
axislabelhtml += g_pc2Label;
axislabelhtml += "</label>";
var zcoords = toScreenXY(new THREE.Vector3(g_xMinimumValue, g_yMinimumValue, g_zMaximumValue),g_sceneCamera,$('#main_plot'));
axislabelhtml += "<label id=\"pc3_label\" class=\"unselectable labels\" style=\"position:absolute; left:"+parseInt(zcoords['x'])+"px; top:"+parseInt(zcoords['y'])+"px;\">";
axislabelhtml += g_pc3Label;
axislabelhtml += "</label>";
document.getElementById("axislabels").innerHTML = axislabelhtml;
}
=======
//Unhides the info box if WebGL is disabled
function overlay() {
overlay = document.getElementById("overlay");
overlay.style.visibility = (overlay.style.visibility == "visible") ? "hidden" : "visible";
parallel = document.getElementById("menu");
parallel.style.visibility = (parallel.style.visibility == "invisible") ? "visible" : "hidden";
separator = document.getElementById("separator");
separator.style.visibility = (separator.style.visibility == "invisible") ? "visible" : "hidden";
plotToggle = document.getElementById("plotToggle");
plotToggle.style.visibility = (plotToggle.style.visibility == "invisible") ? "visible" : "hidden";
}
>>>>>>>
function buildAxisLabels() {
//build axis labels
var axislabelhtml = "";
var xcoords = toScreenXY(new THREE.Vector3(g_xMaximumValue, g_yMinimumValue, g_zMinimumValue),g_sceneCamera,$('#main_plot'));
axislabelhtml += "<label id=\"pc1_label\" class=\"unselectable labels\" style=\"position:absolute; left:"+parseInt(xcoords['x'])+"px; top:"+parseInt(xcoords['y'])+"px;\">";
axislabelhtml += g_pc1Label;
axislabelhtml += "</label>";
var ycoords = toScreenXY(new THREE.Vector3(g_xMinimumValue, g_yMaximumValue, g_zMinimumValue),g_sceneCamera,$('#main_plot'));
axislabelhtml += "<label id=\"pc2_label\" class=\"unselectable labels\" style=\"position:absolute; left:"+parseInt(ycoords['x'])+"px; top:"+parseInt(ycoords['y'])+"px;\">";
axislabelhtml += g_pc2Label;
axislabelhtml += "</label>";
var zcoords = toScreenXY(new THREE.Vector3(g_xMinimumValue, g_yMinimumValue, g_zMaximumValue),g_sceneCamera,$('#main_plot'));
axislabelhtml += "<label id=\"pc3_label\" class=\"unselectable labels\" style=\"position:absolute; left:"+parseInt(zcoords['x'])+"px; top:"+parseInt(zcoords['y'])+"px;\">";
axislabelhtml += g_pc3Label;
axislabelhtml += "</label>";
document.getElementById("axislabels").innerHTML = axislabelhtml;
}
//Unhides the info box if WebGL is disabled
function overlay() {
overlay = document.getElementById("overlay");
overlay.style.visibility = (overlay.style.visibility == "visible") ? "hidden" : "visible";
parallel = document.getElementById("menu");
parallel.style.visibility = (parallel.style.visibility == "invisible") ? "visible" : "hidden";
separator = document.getElementById("separator");
separator.style.visibility = (separator.style.visibility == "invisible") ? "visible" : "hidden";
plotToggle = document.getElementById("plotToggle");
plotToggle.style.visibility = (plotToggle.style.visibility == "invisible") ? "visible" : "hidden";
} |
<<<<<<<
var g_plotEdges = {};
=======
var g_parallelPlots = []
>>>>>>>
var g_plotEdges = {};
var g_parallelPlots = [] |
<<<<<<<
emitLineChanged({ syncSelf = false } = {}) {
socket.emit('lineChanged', { line: state.line, syncSelf });
=======
emitLineChanged () {
socket.emit('lineChanged', { line: state.line })
>>>>>>>
emitLineChanged({ syncSelf = false } = {}) {
socket.emit('lineChanged', { line: state.line, syncSelf });
<<<<<<<
handleKeydown({ key }) {
if (key === 'Enter') this.handleEnter();
else if (key === 'Backspace') this.handleBackspace();
},
handleRunButtonClick() {
let editorCode = editor.getValue().trim();
if (editorCode === '') return;
this.emitLineChanged({ syncSelf: true });
this.emitClear();
this.emitEvaluate(editorCode);
=======
handleKeydown ({ key }) {
if (key === 'Enter') this.handleEnter()
else if (key === 'Backspace') this.handleBackspace()
>>>>>>>
handleKeydown({ key }) {
if (key === 'Enter') this.handleEnter();
else if (key === 'Backspace') this.handleBackspace();
},
handleRunButtonClick() {
let editorCode = editor.getValue().trim();
if (editorCode === '') return;
this.emitLineChanged({ syncSelf: true });
this.emitClear();
this.emitEvaluate(editorCode);
handleKeydown ({ key }) {
if (key === 'Enter') this.handleEnter()
else if (key === 'Backspace') this.handleBackspace() |
<<<<<<<
currentPrompt: null
}
=======
currentPrompt: '',
};
>>>>>>>
currentPrompt: ''
}
<<<<<<<
editor.setOption('mode', language)
state.language = language
resetCurrentPrompt()
languageSelectElem.value = language
term.reset()
term.write(data)
})
=======
editor.setOption('mode', language);
state.language = language;
languageSelectElem.value = language;
term.reset();
term.write(data);
});
>>>>>>>
editor.setOption('mode', language)
state.language = language
languageSelectElem.value = language
term.reset()
term.write(data)
})
<<<<<<<
handleRunButtonClick () {
let editorCode = editor.getValue().trim()
if (editorCode === '') return
this.emitLineChanged()
this.emitClear()
this.emitEvaluate(editorCode)
=======
handleLanguageChange() {
this.clearLine();
this.emitInitRepl();
>>>>>>>
handleRunButtonClick () {
let editorCode = editor.getValue().trim()
if (editorCode === '') return
this.emitLineChanged()
this.emitClear()
this.emitEvaluate(editorCode) |
<<<<<<<
import { auth_cookie_name, COOKIE_PREFIX } from 'Config'
=======
import crypto from 'crypto'
import { AUTH_COOKIE_NAME, COOKIE_PREFIX } from '../../config'
>>>>>>>
import crypto from 'crypto'
import { AUTH_COOKIE_NAME, COOKIE_PREFIX } from 'Config' |
<<<<<<<
settings: {
theme:"clouds",
highlight:false,
fontsize:12,
wordwrap:false,
rightpane:true,
autoTrace:false,
autoTraceLine: 'this.log("sender:", inSender, ", event:", inEvent);',
keys:{ }
},
previewSettings: {
=======
settings: null,
previewSettings: null,
defaultsSettings: {
>>>>>>>
settings: null,
previewSettings: null,
defaultsSettings: {
<<<<<<<
=======
if(!this.settings){
this.settings = enyo.json.parse(enyo.json.stringify(this.defaultsSettings));
}
>>>>>>>
if(!this.settings){
this.settings = enyo.json.parse(enyo.json.stringify(this.defaultsSettings));
}
<<<<<<<
this.$.rightPaneButton.setValue(this.settings.rightpane);
//deep copy: settings in previewSettings
this.previewSettings = enyo.json.parse(enyo.json.stringify(this.settings));
this.$.autoTraceInputBox.setShowing(this.settings.autoTrace);
=======
this.$.rightPaneButton.setValue(settings.rightpane);
>>>>>>>
this.$.rightPaneButton.setValue(settings.rightpane);
this.$.autoTraceInputBox.setShowing(this.settings.autoTrace);
<<<<<<<
},
aTrace: function(inSender, inEvent){
this.trace("sender:", inSender, ", event:", inEvent);
this.previewSettings.autoTrace = inEvent.value;
this.$.autoTraceInputBox.setShowing(this.previewSettings.autoTrace);
},
atraceline: function(inSender, inEvent){
this.trace("sender:", inSender, ", event:", inEvent);
this.previewSettings.autoTraceLine = inSender.value;
=======
},
restoreDefaults: function(){
this.previewSettings = enyo.json.parse(enyo.json.stringify(this.defaultsSettings));
this.initUI(this.defaultsSettings);
this.doChangeSettings();
>>>>>>>
},
restoreDefaults: function(){
this.previewSettings = enyo.json.parse(enyo.json.stringify(this.defaultsSettings));
this.initUI(this.defaultsSettings);
this.doChangeSettings();
},
aTrace: function(inSender, inEvent){
this.trace("sender:", inSender, ", event:", inEvent);
this.previewSettings.autoTrace = inEvent.value;
this.$.autoTraceInputBox.setShowing(this.previewSettings.autoTrace);
},
atraceline: function(inSender, inEvent){
this.trace("sender:", inSender, ", event:", inEvent);
this.previewSettings.autoTraceLine = inSender.value; |
<<<<<<<
_this._shaderUniformLocationsOfExpressions = {};
=======
>>>>>>>
_this._shaderUniformLocationsOfExpressions = {}; |
<<<<<<<
await vscode.workspace.getConfiguration("better-phpunit").update("xmlConfigFilepath", null);
=======
await vscode.workspace.getConfiguration("better-phpunit").update("docker.enable", false);
>>>>>>>
await vscode.workspace.getConfiguration("better-phpunit").update("xmlConfigFilepath", null);
await vscode.workspace.getConfiguration("better-phpunit").update("docker.enable", false);
<<<<<<<
await vscode.workspace.getConfiguration("better-phpunit").update("xmlConfigFilepath", null);
=======
await vscode.workspace.getConfiguration("better-phpunit").update("docker.enable", false);
>>>>>>>
await vscode.workspace.getConfiguration("better-phpunit").update("xmlConfigFilepath", null);
await vscode.workspace.getConfiguration("better-phpunit").update("docker.enable", false); |
<<<<<<<
// Reference container back to document.
document.container.document = document;
=======
if ( this.heartbeat ) {
this.heartbeat.destroy();
}
this.heartbeat = new Heartbeat();
const isOldPageVersion = this.config.document.version && this.helpers.compareVersions( this.config.document.version, '2.5.0', '<' );
if ( ! this.config.user.introduction.flexbox && isOldPageVersion ) {
this.showFlexBoxAttentionDialog();
}
>>>>>>>
// Reference container back to document.
document.container.document = document;
if ( this.heartbeat ) {
this.heartbeat.destroy();
}
this.heartbeat = new Heartbeat();
const isOldPageVersion = this.config.document.version && this.helpers.compareVersions( this.config.document.version, '2.5.0', '<' );
if ( ! this.config.user.introduction.flexbox && isOldPageVersion ) {
this.showFlexBoxAttentionDialog();
} |
<<<<<<<
import DocumentComponent from './document/component';
import ElementsComponent from './document/elements/component';
import DynamicComponent from './document/dynamic/component';
import RepeaterComponent from './document/elements/repeater/component.js';
import HistoryComponent from './document/history/component';
import KitManager from '../../../../core/kits/assets/js/manager.js';
const App = Marionette.Application.extend( {
loaded: false,
previewLoadedOnce: false,
helpers: require( 'elementor-editor-utils/helpers' ),
imagesManager: require( 'elementor-editor-utils/images-manager' ),
debug: require( 'elementor-editor-utils/debug' ),
schemes: require( 'elementor-editor-utils/schemes' ),
presetsFactory: require( 'elementor-editor-utils/presets-factory' ),
templates: require( 'elementor-templates/manager' ),
// TODO: BC Since 2.3.0
ajax: elementorCommon.ajax,
conditions: require( 'elementor-editor-utils/conditions' ),
history: require( 'elementor-modules/history/assets/js/module' ),
channels: {
=======
import ColorControl from './controls/color';
import HistoryManager from 'elementor-modules/history/assets/js/module';
import DocumentsManager from './document/manager';
import Component from './component';
import Document from 'elementor-document/document';
const DEFAULT_DEVICE_MODE = 'desktop';
export default class EditorBase extends Marionette.Application {
widgetsCache = {};
config = {};
loaded = false;
previewLoadedOnce = false;
helpers = require( 'elementor-editor-utils/helpers' );
imagesManager = require( 'elementor-editor-utils/images-manager' ); // TODO: Unused.
debug = require( 'elementor-editor-utils/debug' );
schemes = require( 'elementor-editor-utils/schemes' );
presetsFactory = require( 'elementor-editor-utils/presets-factory' );
templates = require( 'elementor-templates/manager' );
// TODO = BC Since 2.3.0
ajax = elementorCommon.ajax;
conditions = require( 'elementor-editor-utils/conditions' );
history = require( 'elementor-modules/history/assets/js/module' );
channels = {
>>>>>>>
import ColorControl from './controls/color';
import HistoryManager from 'elementor-modules/history/assets/js/module';
import DocumentsManager from './document/manager';
import Component from './component';
import Document from 'elementor-document/document';
import KitManager from '../../../../core/kits/assets/js/manager.js';
const DEFAULT_DEVICE_MODE = 'desktop';
export default class EditorBase extends Marionette.Application {
widgetsCache = {};
config = {};
loaded = false;
previewLoadedOnce = false;
helpers = require( 'elementor-editor-utils/helpers' );
imagesManager = require( 'elementor-editor-utils/images-manager' ); // TODO: Unused.
debug = require( 'elementor-editor-utils/debug' );
schemes = require( 'elementor-editor-utils/schemes' );
presetsFactory = require( 'elementor-editor-utils/presets-factory' );
templates = require( 'elementor-templates/manager' );
// TODO = BC Since 2.3.0
ajax = elementorCommon.ajax;
conditions = require( 'elementor-editor-utils/conditions' );
history = require( 'elementor-modules/history/assets/js/module' );
channels = {
<<<<<<<
$e.components.register( new DocumentComponent() );
$e.components.register( new ElementsComponent() );
$e.components.register( new RepeaterComponent() );
$e.components.register( new HistoryComponent() );
$e.components.register( new DynamicComponent() );
this.kitManager = new KitManager( elementor.config.kit );
=======
>>>>>>>
this.kitManager = new KitManager( elementor.config.kit ); |
<<<<<<<
firstLetterUppercase( string ) {
elementorCommon.helpers.hardDeprecated( 'elementor.helpers.upperCaseWords', '2.3.0', 'elementorCommon.helpers.upperCaseWords' );
return elementorCommon.helpers.upperCaseWords( string );
},
=======
>>>>>>>
<<<<<<<
getModelLabel( model ) {
let result;
if ( ! ( model instanceof Backbone.Model ) ) {
model = new Backbone.Model( model );
}
if ( model.get( 'labelSuffix' ) ) {
result = model.get( 'title' ) + ' ' + model.get( 'labelSuffix' );
} else if ( 'global' === model.get( 'widgetType' ) ) {
if ( model.getTitle ) {
result = model.getTitle();
}
}
if ( ! result ) {
result = elementor.getElementData( model ).title;
}
return result;
},
};
module.exports = helpers;
=======
};
>>>>>>>
getModelLabel( model ) {
let result;
if ( ! ( model instanceof Backbone.Model ) ) {
model = new Backbone.Model( model );
}
if ( model.get( 'labelSuffix' ) ) {
result = model.get( 'title' ) + ' ' + model.get( 'labelSuffix' );
} else if ( 'global' === model.get( 'widgetType' ) ) {
if ( model.getTitle ) {
result = model.getTitle();
}
}
if ( ! result ) {
result = elementor.getElementData( model ).title;
}
return result;
},
}; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.