Skip to content

Commit

Permalink
merge release 0.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
gabidi committed Jun 26, 2020
1 parent 3a69617 commit c0f8d44
Show file tree
Hide file tree
Showing 91 changed files with 4,871 additions and 2,075 deletions.
1 change: 1 addition & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ android {
}

dependencies {
implementation project(':react-native-svg')
// Add v8-android - prebuilt libv8android.so into APK
implementation 'org.chromium:v8-android:+'
implementation project(':react-native-randombytes')
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/java/com/sifir/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.content.Context;
import com.facebook.react.PackageList;
import com.facebook.react.ReactApplication;
import com.horcrux.svg.SvgPackage;
import com.bitgo.randombytes.RandomBytesPackage;
import cl.json.RNSharePackage;
import com.facebook.react.ReactNativeHost;
Expand Down
2 changes: 2 additions & 0 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
rootProject.name = 'Sifir'
include ':react-native-svg'
project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
include ':watermelondb'
project(':watermelondb').projectDir = new File(rootProject.projectDir, '../node_modules/@nozbe/watermelondb/native/android')
include ':react-native-randombytes', ':gopenpgp'
Expand Down
1 change: 1 addition & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ module.exports = {
'@helpers': './src/helpers',
'@types': './src/store/types',
'@screens': './src/components/screens',
'@structures': './src/components/structures',
},
},
],
Expand Down
2 changes: 2 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ target 'Sifir' do

pod 'react-native-randombytes', :path => '../node_modules/react-native-randombytes'

pod 'RNSVG', :path => '../node_modules/react-native-svg'

target 'SifirTests' do
inherit! :search_paths
# Pods for testing
Expand Down
2,389 changes: 1,185 additions & 1,204 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 10 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@
"base-64": "^0.1.0",
"bolt11": "^1.2.7",
"browserify": "^16.5.0",
"cyphernode-js-sdk-transports": "git+https://github.com/gabidi/cyphernode-js-sdk-transports.git#feature/rn",
"cyphernode-js-sdk-transports": "git+https://[email protected]/gabidi/cyphernode-js-sdk-transports.git#feature/rn",
"d3-scale": "^3.2.1",
"moment": "^2.24.0",
"node-libs-react-native": "^1.0.3",
"qr.js": "^0.0.0",
"react": "16.9.0",
"react-native": "0.61.5",
"react-native-androw": "0.0.34",
"react-native-animatable": "^1.3.3",
"react-native-camera": "^3.17.0",
"react-native-crypto": "^2.2.0",
Expand All @@ -44,23 +45,28 @@
"react-native-nav": "^2.0.2",
"react-native-permissions": "^2.0.3",
"react-native-qrcode-scanner": "^1.2.3",
"react-native-range-slider": "^0.1.2",
"react-native-qrcode-svg": "^6.0.6",
"react-native-reanimated": "^1.7.0",
"react-native-safe-area-context": "^0.7.3",
"react-native-screens": "^2.0.0",
"react-native-sensitive-info": "^5.5.3",
"react-native-share": "^2.0.0",
"react-native-slider": "^0.11.0",
"react-native-sliding-up-down-panels": "^1.0.0",
"react-native-svg": "^12.1.0",
"react-native-svg-charts": "^5.4.0",
"react-native-swipe-up-down": "^1.0.7",
"react-native-swipeout": "^2.3.6",
"react-native-tab-view": "^2.14.0",
"react-native-v8": "^0.61.5-patch.2",
"react-native-vector-icons": "^6.6.0",
"react-navigation-transitions": "^1.0.12",
"react-redux": "^7.1.1",
"reanimated-bottom-sheet": "^1.0.0-alpha.20",
"redux": "^4.0.4",
"redux-thunk": "^2.3.0",
"sifir-js-sdk": "git+https://github.com/Sifir-io/sifir-js-sdk.git#feature/rn",
"sifir-js-sdk": "git+https://[email protected]/Sifir-io/sifir-js-sdk.git#master",
"svg-path-properties": "^1.0.4",
"uuid": "^3.4.0",
"vm-browserify": "^1.1.2"
},
Expand Down
Binary file added src/assets/images/arrowupArrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/bitcoinWhiteOutlined.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/confirmed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/filter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/slider [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/slider [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/sliderbutton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/unchecked.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/wasabiLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/wasabiLogo1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions src/assets/svg/Back.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import * as React from 'react';
import Svg, {Path} from 'react-native-svg';

const Back = props => {
return (
<Svg width={24} height={24} viewBox="0 0 24 24" fill="none" {...props}>
<Path
d="M15 18l-6-6 6-6"
stroke="#fff"
strokeWidth={2}
strokeLinecap="round"
strokeLinejoin="round"
/>
</Svg>
);
};

export default Back;
5 changes: 5 additions & 0 deletions src/assets/svg/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import Back from './Back';

export default {
Back,
};
2 changes: 2 additions & 0 deletions src/common/AppStyle.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ export default {
secondaryColor: '#4B53FF',
errorColor: '#D0021B',
orange: 'orange',
grayColor: '#ABA8A8',
tertiaryColor: '#122C3A',
};
14 changes: 14 additions & 0 deletions src/common/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@ export const C = {
STR_SHOP: 'SHOP',
STR_SETTINGS: 'SETTINGS',
STR_Cur_Balance: 'Current Balance',
STR_Wasabi_Header: 'Total Balance having minimum Anonset ',
STR_Balance_Channels_n_Outputs: 'Channels & Outputs Balance',
STR_Balance_Outputs: 'Balance (Outputs)',
STR_Balance_Channels: 'Balance (Channels)',
STR_Hops_to_route: 'hop to payee',
STR_INVOICES_AND_PAYS: 'Invoices & Pays',
STR_TRANSACTIONS: 'Transactions',
STR_ALL_TRANSACTIONS: 'All Transactions',
STR_SEND: 'SEND',
STR_BACK: 'BACK',
STR_Send: 'Send',
STR_TxID: 'TxID',
STR_ChannelID: 'Channel ID',
Expand Down Expand Up @@ -106,6 +109,10 @@ export const C = {
STR_WATCH_WALLET_TYPE: 'pub32Watching',
STR_WATCHING: 'Watching',
STR_SPEND_WALLET_TYPE: 'btcSpending',
STR_SPEND_WALLET_LABEL: 'Spending',
STR_WASABI_WALLET_TYPE: 'wasabiWallet',
STR_WASABI_WALLET_LABEL: 'Wasabi',
STR_UNSPENT_COINS: 'unspentCoins',
STR_LN_WALLET_TYPE: 'ln',
STR_LN_WITHDRAW: 'LNwithdraw',
STR_WATCH_ONLY: 'WATCH ONLY',
Expand All @@ -127,6 +134,13 @@ export const C = {
STR_Segwit_Compatible: 'Segwit Compatible (P2SH)',
STR_Bech32: 'Segwit Native (Bech32)',
STR_Wallet_balance: 'Wallet Balance',
STR_Min_Anonset: 'Min Anonset',
STR_Anonim_Level: 'Anonimity Level',
STR_Set_Min_Anonset: 'Set Minimum Anonset',
STR_Auto_mix_account_select:
'Funds reaching the minimum anonset specified will be sent to',
STR_Select_Account:
'Select one account to which the Wasabi wallet will autosend funds to.',
// --- ERRORS --
STR_ERROR_app: 'App Error',
STR_ERROR: 'Error',
Expand Down
7 changes: 7 additions & 0 deletions src/common/images.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default {
icon_receive: require('./../assets/images/down_cir.png'),
icon_chanel: require('./../assets/images/light_cir.png'),
icon_up_arrow: require('./../assets/images/up_arrow.png'),
upArrow: require('./../assets/images/arrowupArrow.png'),
icon_up_blue: require('./../assets/images/uparrow_blue.png'),
icon_down_arrow: require('./../assets/images/down_arrow.png'),
icon_btc_cir: require('./../assets/images/bitcoin_blue.png'),
Expand Down Expand Up @@ -61,4 +62,10 @@ export default {
icon_chatSend: require('./../assets/images/chatSend.png'),
icon_yellowTxn: require('./../assets/images/yellowTxn.png'),
icon_thickGreenArrowTxn: require('./../assets/images/bold_arrow.png'),
filter_icon: require('./../assets/images/filter.png'),
icon_wasabi: require('./../assets/images/wasabiLogo.png'),
icon_wasabi_clicked: require('./../assets/images/wasabiLogo1.png'),
icon_confirmed: require('./../assets/images/confirmed.png'),
icon_unconfirmed: require('./../assets/images/unchecked.png'),
icon_bitcoinWhiteOutlined: require('./../assets/images/bitcoinWhiteOutlined.png'),
};
3 changes: 2 additions & 1 deletion src/common/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {C} from './constants';
import Images from './images';
import AppStyle from './AppStyle';
import svg from '../assets/svg';

export {C, Images, AppStyle};
export {C, Images, AppStyle, svg};
23 changes: 18 additions & 5 deletions src/components/elements/SifirAccountActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,19 @@ import {
} from 'react-native';
import {Images, AppStyle, C} from '@common/index';

const SifirAccountActions = ({type, handleReceiveButton, handleSendBtn}) => {
const SifirAccountActions = ({
type,
sendActionButtonLabel,
handleReceiveButton,
handleSendBtn,
isDisabled = false,
}) => {
const [btnStatus, setButtonStatus] = useState(0);
return (
<View style={styles.btnAreaView}>
{!!handleSendBtn && (
<TouchableWithoutFeedback
disabled={isDisabled}
style={{flex: 1}}
onPressIn={() => setButtonStatus(1)}
onPressOut={() => {
Expand All @@ -23,9 +30,13 @@ const SifirAccountActions = ({type, handleReceiveButton, handleSendBtn}) => {
<View
style={[
styles.txnBtnView,
btnStatus === 1 ? {backgroundColor: 'black', opacity: 0.7} : {},
btnStatus === 1 || isDisabled
? {backgroundColor: 'black', opacity: 0.7}
: {},
]}>
<Text style={{color: 'white', fontSize: 15}}>{C.STR_SEND}</Text>
<Text style={{color: 'white', fontSize: 15}}>
{sendActionButtonLabel}
</Text>
<Image
source={Images.icon_up_arrow}
style={{width: 11, height: 11, marginLeft: 10}}
Expand All @@ -35,6 +46,7 @@ const SifirAccountActions = ({type, handleReceiveButton, handleSendBtn}) => {
)}
{!!handleReceiveButton && (
<TouchableWithoutFeedback
disabled={isDisabled}
style={{flex: 1}}
onPressIn={() => setButtonStatus(2)}
onPressOut={() => {
Expand All @@ -45,7 +57,9 @@ const SifirAccountActions = ({type, handleReceiveButton, handleSendBtn}) => {
style={[
styles.txnBtnView,
styles.leftTxnBtnView,
btnStatus === 2 ? {backgroundColor: 'black', opacity: 0.7} : {},
btnStatus === 2 || isDisabled
? {backgroundColor: 'black', opacity: 0.7}
: {},
]}>
<Text style={[{color: 'white', fontSize: 15}]}>
{C.STR_RECEIVE}
Expand All @@ -63,7 +77,6 @@ const SifirAccountActions = ({type, handleReceiveButton, handleSendBtn}) => {

const styles = StyleSheet.create({
btnAreaView: {
flex: 1,
flexDirection: 'row',
borderColor: AppStyle.mainColor,
borderWidth: 1,
Expand Down
Loading

0 comments on commit c0f8d44

Please sign in to comment.