Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 74 additions & 6 deletions ios/edge.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

4,840 changes: 4,180 additions & 660 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"async": "^2.3.0",
"asyncstorage-down": "^4.0.1",
"base64-js": "^1.2.0",
"biggystring": "^1.0.4",
"browserify-zlib": "^0.1.4",
"buffer": "^3.6.0",
"console-browserify": "^1.1.0",
Expand Down
6 changes: 6 additions & 0 deletions src/modules/Core/selectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ export const getCurrencyConverter = (state) => {
return currencyConverter
}

export const getExchangeRate = (state, fromCurrencyCode, toCurrencyCode) => {
const currencyConverter = getCurrencyConverter(state)
const exchangeRate = currencyConverter.currencyConverter(fromCurrencyCode, toCurrencyCode, 1)
return exchangeRate
}

export const getBalanceInCrypto = (state, walletId, currencyCode) => {
const balanceInCrypto = getWallet(state, walletId).getBalance(currencyCode)
console.log('balanceInCrypto', balanceInCrypto)
Expand Down
12 changes: 0 additions & 12 deletions src/modules/UI/Settings/reducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,6 @@ export const settings = (state = initialState, action) => {
}
}

case ACTION.SET_SHITCOIN_DENOMINATION: {
const { denomination } = data
const TRD = state['TRD']
return {
...state,
TRD: {
...TRD,
denomination
}
}
}

default:
return state
}
Expand Down
31 changes: 30 additions & 1 deletion src/modules/UI/Settings/selectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export const getSettings = (state) => {
return settings
}

export const getDenominationIndex = (state, currencyCode) => {
export const getDenominationIndex = (state, currencyCode: string) => {
const settings = getSettings(state)
const currencySettings = settings[currencyCode]
let denominationIndex
Expand All @@ -12,3 +12,32 @@ export const getDenominationIndex = (state, currencyCode) => {
}
return denominationIndex
}

export const getCurrencySettings = (state, currencyCode: string) => {
const settings = getSettings(state)
const currencySettings = settings[currencyCode]
return currencySettings
}

export const getCurrencyDenomination = (state, currencyCode: string) => {
const currencySettings = getCurrencySettings(state, currencyCode)
const denomination = currencySettings.denomination
return denomination
}

export const getNativeToDenominationRatio = (state, currencyCode: string) => {
const currencySettings = getCurrencySettings(state, currencyCode)
const nativeToDenominationRatio = currencySettings.denomination.nativeToDenominationRatio
return nativeToDenominationRatio
}

export const getAdapters = (state) => {
const settings = getSettings(state)
const adapters = settings.adapters
return adapters
}

export const getBaseDenomination = (state, currencyCode: string): string => {
const currencySettings = getCurrencySettings(state, currencyCode)
currencySettings.denomination
}
4 changes: 2 additions & 2 deletions src/modules/UI/components/ExchangeRate/ExchangeRate.ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ const styles = StyleSheet.create({
}
})

const ExchangeRate = ({fiatPerCrypto, fiatCurrencyCode, cryptoDenom}) => {
const ExchangeRate = ({fiatPerCrypto, fiatCurrencyCode, cryptoDenomination}) => {
const text = fiatPerCrypto === 0
? <Text style={styles.text}>Exchange Rate loading...</Text>
: <Text style={styles.text}>
1 {cryptoDenom.name} = {fiatCurrencyCode} {(fiatPerCrypto).toFixed(2)}
1 {cryptoDenomination.name} = {fiatCurrencyCode} {(fiatPerCrypto).toFixed(2)}
</Text>

return (
Expand Down
106 changes: 106 additions & 0 deletions src/modules/UI/components/FlipInput/ExchangedFlipInput.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
import React, { Component } from 'react'
import FlipInput from './FlipInput.ui.js'

import {
convertDenominationToBase,
convertBaseToBase,
convertBaseToDenomination,
deriveDenominationToBaseRatio
} from '../../../utils.js'

export default class ExchangedFlipInput extends Component {
constructor (props) {
super(props)

this.state = {
primaryDenominationAmount: '0',
secondaryDenominationAmount: '0'
}
}

onPrimaryAmountChange = (primaryDenominationAmount) => {
const secondaryDenominationAmount =
this.convertPrimaryDenominationToSecondaryDenomination(primaryDenominationAmount)
this.setState({
primaryDenominationAmount,
secondaryDenominationAmount
})
this.props.onAmountsChange({
primaryDenominationAmount,
secondaryDenominationAmount
})
}

onSecondaryAmountChange = (secondaryDenominationAmount) => {
const primaryDenominationAmount =
this.convertSecondaryDenominationToPrimaryDenomination(secondaryDenominationAmount)
this.setState({
primaryDenominationAmount,
secondaryDenominationAmount
})
this.props.onAmountsChange({
primaryDenominationAmount,
secondaryDenominationAmount
})
}

convertPrimaryDenominationToSecondaryDenomination = (primaryDenominationAmount: string): string => {
const primaryBaseAmount = this.convertPrimaryDenominationToPrimaryBase(primaryDenominationAmount)
const secondaryBaseAmount = this.convertPrimaryBaseToSecondaryBase(primaryBaseAmount)
const secondaryDenominationAmount = this.convertSecondaryBaseToSecondaryDenomination(secondaryBaseAmount)
return secondaryDenominationAmount
}

convertSecondaryDenominationToPrimaryDenomination = (secondaryDenominationAmount: string): string => {
const secondaryBaseAmount = this.convertSecondaryDenominationToSecondaryBase(secondaryDenominationAmount)
const primaryBaseAmount = this.convertSecondaryBaseToPrimaryBase(secondaryBaseAmount)
const primaryDenominationAmount = this.convertPrimaryBaseToPrimaryDenomination(primaryBaseAmount)
return primaryDenominationAmount
}

render () {
const primary = this.props.primary
const secondary = this.props.secondary

return (
<FlipInput
color={this.props.color}

primary={primary}
primaryDenominationAmount={this.state.primaryDenominationAmount}
onPrimaryAmountChange={this.onPrimaryAmountChange}

secondary={secondary}
secondaryDenominationAmount={this.state.secondaryDenominationAmount}
onSecondaryAmountChange={this.onSecondaryAmountChange} />
)
}

getPrimaryDenominationToBaseRatio = (): string => {
return deriveDenominationToBaseRatio(this.props.primary.baseDenomination.multiplier)(this.props.primary.denomination.multiplier)
}
getSecondaryDenominationToBaseRatio = (): string => {
return deriveDenominationToBaseRatio(this.props.secondary.baseDenomination.multiplier)(this.props.secondary.denomination.multiplier)
}

convertPrimaryDenominationToPrimaryBase = (primaryDenominationAmount: string): number => {
return convertDenominationToBase(this.getPrimaryDenominationToBaseRatio())(primaryDenominationAmount)
}
convertSecondaryDenominationToSecondaryBase = (secondaryDenominationAmount: string): number => {
return convertDenominationToBase(this.getSecondaryDenominationToBaseRatio())(secondaryDenominationAmount)
}

convertPrimaryBaseToSecondaryBase = (primaryBaseAmount: number): number => {
return convertBaseToBase(this.props.secondaryToPrimaryRatio)(primaryBaseAmount)
}
convertSecondaryBaseToPrimaryBase = (secondaryBaseAmount: number): number => {
return convertBaseToBase(1 / this.props.secondaryToPrimaryRatio)(secondaryBaseAmount)
}

convertPrimaryBaseToPrimaryDenomination = (primaryBaseAmount: number): string => {
return convertBaseToDenomination(this.getPrimaryDenominationToBaseRatio())(primaryBaseAmount)
}
convertSecondaryBaseToSecondaryDenomination = (secondaryBaseAmount: number): string => {
return convertBaseToDenomination(this.getSecondaryDenominationToBaseRatio())(secondaryBaseAmount)
}
}
Loading