diff --git a/FantomWallet/android/app/build.gradle b/FantomWallet/android/app/build.gradle
index a233dfb0..8c57c36f 100644
--- a/FantomWallet/android/app/build.gradle
+++ b/FantomWallet/android/app/build.gradle
@@ -21,10 +21,10 @@ android {
}
defaultConfig {
- applicationId "com.fantomwallet"
+ applicationId "com.fantomwallet.foundation"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 2
+ versionCode 3
versionName "1.0"
}
splits {
@@ -67,8 +67,8 @@ android {
}
dependencies {
- implementation project(':react-native-gesture-handler')
- implementation project(':react-native-reanimated')
+ implementation project(':react-native-gesture-handler')
+ implementation project(':react-native-reanimated')
compile project(':react-native-udp')
compile project(':react-native-tcp')
compile project(':react-native-os')
diff --git a/FantomWallet/ios/FantomWallet.xcodeproj/project.pbxproj b/FantomWallet/ios/FantomWallet.xcodeproj/project.pbxproj
index c801003b..4ecb3467 100644
--- a/FantomWallet/ios/FantomWallet.xcodeproj/project.pbxproj
+++ b/FantomWallet/ios/FantomWallet.xcodeproj/project.pbxproj
@@ -1704,7 +1704,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1.0.20;
+ CURRENT_PROJECT_VERSION = 1.0.21;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = Z9Z83R4W7B;
HEADER_SEARCH_PATHS = (
@@ -1750,7 +1750,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1.0.20;
+ CURRENT_PROJECT_VERSION = 1.0.21;
DEVELOPMENT_TEAM = Z9Z83R4W7B;
HEADER_SEARCH_PATHS = (
"$(inherited)",
diff --git a/FantomWallet/src/navigation/RootNavigator.js b/FantomWallet/src/navigation/RootNavigator.js
index 5ccb41d5..0d54eb74 100644
--- a/FantomWallet/src/navigation/RootNavigator.js
+++ b/FantomWallet/src/navigation/RootNavigator.js
@@ -35,6 +35,9 @@ const RootNavigator = createStackNavigator(
},
{
headerMode: 'none',
+ cardStyle: {
+ backgroundColor: '#111',
+ },
},
);
diff --git a/FantomWallet/src/views/Home/Deposit/depositViewInfo/index.js b/FantomWallet/src/views/Home/Deposit/depositViewInfo/index.js
index 0dafa7d6..44761be4 100644
--- a/FantomWallet/src/views/Home/Deposit/depositViewInfo/index.js
+++ b/FantomWallet/src/views/Home/Deposit/depositViewInfo/index.js
@@ -65,7 +65,8 @@ export const DepositViewInfoContainer = ({ publicKey, setAlert }: Props) => {
return (
{/* QR code */}
@@ -98,8 +99,6 @@ export const DepositViewInfoContainer = ({ publicKey, setAlert }: Props) => {
Share
-
-
);
};
diff --git a/FantomWallet/src/views/Home/Deposit/depositViewInfo/styles.js b/FantomWallet/src/views/Home/Deposit/depositViewInfo/styles.js
index 145a7c92..f43c7273 100644
--- a/FantomWallet/src/views/Home/Deposit/depositViewInfo/styles.js
+++ b/FantomWallet/src/views/Home/Deposit/depositViewInfo/styles.js
@@ -3,8 +3,11 @@ import { StyleSheet } from 'react-native';
import { DEVICE_HEIGHT, DEVICE_WIDTH } from '~/common/constants';
export default StyleSheet.create({
- fantomViewStyle: {
- height: DEVICE_HEIGHT,
+ scroll: {
+ height: '100%',
+ },
+ scrollContent: {
+ paddingBottom: 100,
},
amountDisplayStyle: {
backgroundColor: '#fff',
diff --git a/FantomWallet/src/views/Home/Deposit/index.js b/FantomWallet/src/views/Home/Deposit/index.js
index 411c2e1a..13297aa2 100644
--- a/FantomWallet/src/views/Home/Deposit/index.js
+++ b/FantomWallet/src/views/Home/Deposit/index.js
@@ -11,11 +11,10 @@ import BackgroundIcon from '~/images/BackgroundIcon.png';
* To Display DepositTab related tasks
*/
export default () => (
-
-
-
-
-
+
+
+
+
);
diff --git a/FantomWallet/src/views/Home/Deposit/styles.js b/FantomWallet/src/views/Home/Deposit/styles.js
index dcfb6dbe..7e4a5666 100644
--- a/FantomWallet/src/views/Home/Deposit/styles.js
+++ b/FantomWallet/src/views/Home/Deposit/styles.js
@@ -1,27 +1,19 @@
import { StyleSheet, Platform } from 'react-native';
-import { DEVICE_HEIGHT, DEVICE_WIDTH } from '~/common/constants';
const isAndroid = Platform.OS === 'android';
export default StyleSheet.create({
- depositViewStyle: {
- height: DEVICE_HEIGHT,
- width: DEVICE_WIDTH,
- backgroundColor: 'rgb(14,14,18)',
- },
- textViewStyle: {},
depositScreenStyle: {
- width: DEVICE_WIDTH,
- height: DEVICE_HEIGHT * 0.84,
+ flex: 1,
backgroundColor: 'rgb(14,14,18)',
},
backgroundIconStyle: {
- width: DEVICE_WIDTH * 0.45,
- height: DEVICE_HEIGHT * 0.85,
+ position: 'absolute',
justifyContent: 'center',
alignItems: 'center',
+ width: '45%',
+ height: '85%',
top: 0,
- position: 'absolute',
opacity: !isAndroid ? 0.03 : 0.02,
- right: -((DEVICE_WIDTH * 0.3) / 2),
+ right: '-15%',
},
});
diff --git a/FantomWallet/src/views/Home/Wallet/index.js b/FantomWallet/src/views/Home/Wallet/index.js
index b8097610..9d2651ec 100644
--- a/FantomWallet/src/views/Home/Wallet/index.js
+++ b/FantomWallet/src/views/Home/Wallet/index.js
@@ -49,19 +49,16 @@ export const Wallet = ({
}, []);
return (
-
-
-
-
-
-
-
+
+
+
+
);
};
diff --git a/FantomWallet/src/views/Home/Wallet/styles.js b/FantomWallet/src/views/Home/Wallet/styles.js
index 2b89f312..0d401a0a 100644
--- a/FantomWallet/src/views/Home/Wallet/styles.js
+++ b/FantomWallet/src/views/Home/Wallet/styles.js
@@ -1,30 +1,20 @@
import { Platform, StyleSheet } from 'react-native';
-import { DEVICE_HEIGHT, DEVICE_WIDTH } from '~/common/constants';
const isIOS = Platform.OS === 'ios';
export default StyleSheet.create({
- walletViewStyle: {
- height: DEVICE_HEIGHT,
- width: DEVICE_WIDTH,
- backgroundColor: 'rgb(14,14,18)',
- },
- textViewStyle: {},
- arrowNavigationStyle: {
- backgroundColor: '#fff',
- },
walletScreenStyle: {
flex: 1,
- backgroundColor: 'white',
+ backgroundColor: 'rgb(14,14,18)',
},
backgroundImgStyle: {
- width: DEVICE_WIDTH * 0.45,
- height: DEVICE_HEIGHT * 0.85,
+ position: 'absolute',
justifyContent: 'center',
alignItems: 'center',
+ width: '45%',
+ height: '85%',
top: 0,
- position: 'absolute',
opacity: isIOS ? 0.03 : 0.02,
- right: -((DEVICE_WIDTH * 0.3) / 2),
+ right: '-15%',
},
});
diff --git a/FantomWallet/src/views/Home/Wallet/transactionView/index.js b/FantomWallet/src/views/Home/Wallet/transactionView/index.js
index b87276c0..b2f7beb1 100644
--- a/FantomWallet/src/views/Home/Wallet/transactionView/index.js
+++ b/FantomWallet/src/views/Home/Wallet/transactionView/index.js
@@ -84,7 +84,7 @@ export const TransactionViewContainer = ({ publicKey, isLoading, fantomTransacti
-
+
{isLoading === false && fantomTransactionArr.length === 0 && (
{
- const tabRenderInfo = 'Point';
-
- // coinst handleSelectedTab = (index, tabRenderInfo) => {
- // setTabRenderInfo(tabRenderInfo)
- // }
-
- return (
+}: Props) => (
);
-};
const mapStateToProps = state => ({
publicKey: state.keys.publicKey,
diff --git a/FantomWallet/src/views/Home/Wallet/walletView/styles.js b/FantomWallet/src/views/Home/Wallet/walletView/styles.js
index fbaf86e9..9133121e 100644
--- a/FantomWallet/src/views/Home/Wallet/walletView/styles.js
+++ b/FantomWallet/src/views/Home/Wallet/walletView/styles.js
@@ -1,18 +1,16 @@
import { StyleSheet } from 'react-native';
-import { WHITE_COLOR, DEVICE_WIDTH, DEVICE_HEIGHT } from '~/common/constants';
+import { DEVICE_WIDTH, DEVICE_HEIGHT } from '~/common/constants';
export default StyleSheet.create({
mainContainerStyle: {
height: DEVICE_HEIGHT,
- backgroundColor: WHITE_COLOR,
justifyContent: 'flex-end',
},
tabInfoStyle: {
flex: 1,
},
navigationTabStyle: {
- backgroundColor: 'white',
width: DEVICE_WIDTH,
flexDirection: 'row',
height: 44,
diff --git a/FantomWallet/src/views/Home/Wallet/walletViewInfo/index.js b/FantomWallet/src/views/Home/Wallet/walletViewInfo/index.js
index 60b8784d..b0024834 100644
--- a/FantomWallet/src/views/Home/Wallet/walletViewInfo/index.js
+++ b/FantomWallet/src/views/Home/Wallet/walletViewInfo/index.js
@@ -44,7 +44,7 @@ export const WalletFantomScreen = ({
showsVerticalScrollIndicator={false}
refreshControl={}
>
-
+
{
@@ -235,7 +236,6 @@ export const Withdraw = ({ balance }: Props) => {
Send
-
);
diff --git a/FantomWallet/src/views/Home/Withdraw/styles.js b/FantomWallet/src/views/Home/Withdraw/styles.js
index 604657c7..5959faad 100644
--- a/FantomWallet/src/views/Home/Withdraw/styles.js
+++ b/FantomWallet/src/views/Home/Withdraw/styles.js
@@ -5,9 +5,13 @@ const isAndroid = Platform.OS === 'android';
export default StyleSheet.create({
scroll: {
- height: DEVICE_HEIGHT,
+ height: '100%',
+ },
+ scrollContent: {
+ paddingBottom: 100,
},
mainContainerStyle: {
+ flex: 1,
height: DEVICE_HEIGHT,
width: DEVICE_WIDTH,
backgroundColor: 'rgb(14,14,18)',
@@ -16,18 +20,17 @@ export default StyleSheet.create({
height: 32,
},
backgroundIconStyle: {
- width: DEVICE_WIDTH * 0.45,
- height: DEVICE_HEIGHT * 0.85,
+ position: 'absolute',
justifyContent: 'center',
alignItems: 'center',
- top: 0,
- position: 'absolute',
+ width: '45%',
+ height: '85%',
opacity: !isAndroid ? 0.03 : 0.02,
- right: -((DEVICE_WIDTH * 0.3) / 2),
+ right: '-15%',
},
amtContainer: {
backgroundColor: 'rgb(44,52,58)',
- height: 120,
+ height: 150,
width: DEVICE_WIDTH - 32,
alignSelf: 'center',
borderRadius: 10,
diff --git a/FantomWallet/src/views/Welcome/CreateMnemonic/styles.js b/FantomWallet/src/views/Welcome/CreateMnemonic/styles.js
index 55a1c737..9afa399f 100644
--- a/FantomWallet/src/views/Welcome/CreateMnemonic/styles.js
+++ b/FantomWallet/src/views/Welcome/CreateMnemonic/styles.js
@@ -135,8 +135,5 @@ export default StyleSheet.create({
bottom: 0,
width: DEVICE_WIDTH,
},
- dropdown: {
- backgroundColor: 'rgb(0,168,251)',
- },
empty: { height: DEVICE_HEIGHT * 0.15 },
});