Merge pull request #13 from coingrig/develop

Develop

App.js

@@ -4,6 +4,8 @@ import {NavigationContainer} from '@react-navigation/native';
 // eslint-disable-next-line no-unused-vars
 import AppsStateService from './src/services/appStates';
 // eslint-disable-next-line no-unused-vars
+import NotificationServices from './src/services/notifications';
+// eslint-disable-next-line no-unused-vars
 import DeepLinkService from './src/services/deeplink';
 import {MenuProvider} from 'react-native-popup-menu';
 import {NavigationScreens} from './src/routes';

android/app/build.gradle

@@ -134,8 +134,8 @@ android {
         applicationId "com.coingrig"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 48
-        versionName "1.3.5"
+        versionCode 49
+        versionName "1.3.6"
         missingDimensionStrategy 'react-native-camera', 'general'
 
     }
@@ -212,6 +212,7 @@ dependencies {
     debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.flipper'
     }
+
 
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";

android/build.gradle

@@ -11,6 +11,7 @@ buildscript {
     repositories {
         google()
         jcenter()
+        gradlePluginPortal()
     }
     dependencies {
         classpath("com.android.tools.build:gradle:4.1.0")

ios/Coingrig.xcodeproj/project.pbxproj

@@ -641,7 +641,7 @@
 				CODE_SIGN_ENTITLEMENTS = Coingrig/Coingrig.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = L63HFFVTBZ;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -718,7 +718,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 1.3.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -743,7 +743,7 @@
 				CODE_SIGN_ENTITLEMENTS = Coingrig/Coingrig.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Qubevo Sourcing SRL (L63HFFVTBZ)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEVELOPMENT_TEAM = L63HFFVTBZ;
 				"HEADER_SEARCH_PATHS[arch=*]" = (
 					"$(inherited)",
@@ -819,7 +819,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 1.3.6;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -867,7 +867,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -932,7 +932,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

ios/Coingrig/Coingrig.entitlements

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>aps-environment</key>
+	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:link.coingrig.com</string>

ios/Podfile.lock

@@ -89,6 +89,7 @@ PODS:
   - lottie-react-native (4.0.3):
     - lottie-ios (~> 3.2.3)
     - React-Core
+  - OneSignalXCFramework (3.10.0)
   - OpenSSL-Universal (1.1.180)
   - Permission-Camera (3.0.5):
     - RNPermissions
@@ -295,6 +296,9 @@ PODS:
     - React-Core
   - react-native-encrypted-storage (4.0.2):
     - React-Core
+  - react-native-onesignal (4.3.4):
+    - OneSignalXCFramework (= 3.10.0)
+    - React (< 1.0.0, >= 0.13.0)
   - react-native-pager-view (5.4.1):
     - React-Core
   - react-native-randombytes (3.6.1):
@@ -432,9 +436,9 @@ PODS:
     - React
   - RNVectorIcons (7.1.0):
     - React
-  - SDWebImage (5.12.2):
-    - SDWebImage/Core (= 5.12.2)
-  - SDWebImage/Core (5.12.2)
+  - SDWebImage (5.12.3):
+    - SDWebImage/Core (= 5.12.3)
+  - SDWebImage/Core (5.12.3)
   - SDWebImageWebPCoder (0.6.1):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.7)
@@ -489,6 +493,7 @@ DEPENDENCIES:
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - react-native-camera (from `../node_modules/react-native-camera`)
   - react-native-encrypted-storage (from `../node_modules/react-native-encrypted-storage`)
+  - react-native-onesignal (from `../node_modules/react-native-onesignal`)
   - react-native-pager-view (from `../node_modules/react-native-pager-view`)
   - react-native-randombytes (from `../node_modules/react-native-randombytes`)
   - react-native-restart (from `../node_modules/react-native-restart`)
@@ -540,6 +545,7 @@ SPEC REPOS:
     - FlipperKit
     - libevent
     - libwebp
+    - OneSignalXCFramework
     - OpenSSL-Universal
     - SDWebImage
     - SDWebImageWebPCoder
@@ -592,6 +598,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-camera"
   react-native-encrypted-storage:
     :path: "../node_modules/react-native-encrypted-storage"
+  react-native-onesignal:
+    :path: "../node_modules/react-native-onesignal"
   react-native-pager-view:
     :path: "../node_modules/react-native-pager-view"
   react-native-randombytes:
@@ -673,7 +681,7 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
   FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
-  FBReactNativeSpec: 5a6b75a68b0b65cdcb7a94b7880e0b0f866bfd50
+  FBReactNativeSpec: 6f4010c716a5b029c606cb6dc9ec523cdaeaa72c
   Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
@@ -686,6 +694,7 @@ SPEC CHECKSUMS:
   libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
   lottie-ios: c058aeafa76daa4cf64d773554bccc8385d0150e
   lottie-react-native: 96361a9891cf651534ea35c4f85f33d4cf14ed13
+  OneSignalXCFramework: 10648e60ff3d335fbffa62d9b44b700b56d49b51
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
   Permission-Camera: ac603073e4128e51e6ca3c39129778f05b4082fa
   RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
@@ -701,6 +710,7 @@ SPEC CHECKSUMS:
   React-jsinspector: cc614ec18a9ca96fd275100c16d74d62ee11f0ae
   react-native-camera: fdfefd4139bbbb53f69e8b6fde1ee549b524eb88
   react-native-encrypted-storage: e78d848ce0fb663c2ce306e37921d026809322e6
+  react-native-onesignal: 9e10487bcba41ebcb4655b45d9bdd0b63f5e220f
   react-native-pager-view: 43f51f45f37ec9715f6c188e4af46ccdf79872e8
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
   react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979
@@ -734,7 +744,7 @@ SPEC CHECKSUMS:
   RNSmartCode: b7410d659677d180a640e850e15eb4980d744d70
   RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
   RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
-  SDWebImage: 240e5c12b592fb1268c1d03b8c90d90e8c2ffe82
+  SDWebImage: 53179a2dba77246efa8a9b85f5c5b21f8f43e38f
   SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21
   TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
   Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coingrig",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "private": true,
   "scripts": {
     "android": "npx react-native run-android",
@@ -79,6 +79,7 @@
     "react-native-level-fs": "3.0.1",
     "react-native-localize": "^2.1.6",
     "react-native-logs": "^3.0.4",
+    "react-native-onesignal": "^4.3.4",
     "react-native-os": "1.2.6",
     "react-native-pager-view": "5.4.1",
     "react-native-parallax-scroll-view": "^0.21.3",

src/components/Modal/index.tsx

@@ -0,0 +1,39 @@
+import React from 'react';
+import {View, Alert, Modal} from 'react-native';
+import {Colors} from 'utils/colors';
+
+export default function CustomModal({show}) {
+  const [visible, setVisible] = React.useState(show);
+
+  React.useEffect(() => {
+    setVisible(show);
+  }, [show]);
+
+  return (
+    <Modal
+      animationType="fade"
+      transparent={true}
+      visible={visible}
+      style={{backgroundColor: Colors.background, flex: 1}}
+      onRequestClose={() => {
+        Alert.alert('Modal has been closed.');
+        setVisible(!visible);
+      }}>
+      <View style={{flex: 1, backgroundColor: 'black', opacity: 0.7}} />
+      <View
+        style={{
+          height: '50%',
+          width: '90%',
+          backgroundColor: Colors.background,
+          justifyContent: 'center',
+          alignSelf: 'center',
+          alignContent: 'center',
+          alignItems: 'center',
+          position: 'absolute',
+          bottom: '25%',
+          borderRadius: 10,
+        }}
+      />
+    </Modal>
+  );
+}

src/config.sample.js

@@ -6,8 +6,8 @@ process.env.TESTNET = false;
 
 // LogBox.ignoreLogs(['Easing']);
 
-CONFIG.APP_VERSION = '1.3.3 (35)';
-CONFIG.BUILD_NUMBER = 35;
+CONFIG.APP_VERSION = '1.3.5 (49)';
+CONFIG.BUILD_NUMBER = 49;
 CONFIG.TESTNET = process.env.TESTNET;
 CONFIG.COINGRIG_KEY = '';
 CONFIG.DEFAULT_DERIVATION_KEY = 0;
@@ -18,7 +18,9 @@ CONFIG.COVALENT_KEY = '';
 CONFIG.OPENSEA_KEY = '';
 CONFIG.MIGRATION_KEY = '@MIGRATION_KEY';
 CONFIG.INIT_KEY = '@init';
-
+CONFIG.ONESIGNAL_KEY = '';
+CONFIG.SWAP_FEE = 0; // 0%
+CONFIG.FEE_RECIPIENT = '';
 // CONFIG.testNFTs = '';
 
 export default CONFIG;

src/i18n/languages/en.json

@@ -216,12 +216,20 @@
       "swap.error.swap_not_found": "No swap available for this pair!",
       "swap.error.not_enough_balance": "Not enough balance for the swap or for the fees!",
       "swap.error.swap_chain_not_supported": "The chain you request is not supported!",
+      "swap.coingrig_fee": "Coingrig Fee",
 
       "nft.description": "Description",
       "nft.no_description": "No Description",
       "nft.created_date": "Created",
       "nft.sales": "Sales",
       "nft.symbol": "Symbol",
-      "nft.total_supply": "Total supply"
+      "nft.total_supply": "Total supply",
+
+      "token_connect.title": "TokenConnect",
+      "token_connect.error.invalid_link_configuration": "The used link is not valid!",
+      "token_connect.swapintro_one": "For the desired swap, the following token needs to be tracked in your portfolio",
+      "token_connect.swapintro_other": "For the desired swap, the following tokens need to be tracked in your portfolio",
+      "token_connect.add_asset_one": "Add Token",
+      "token_connect.add_asset_other": "Add Tokens"
   }
 }

src/i18n/languages/fr.json

@@ -216,12 +216,20 @@
       "swap.error.swap_not_found": "Pas de swap disponible pour cette paire!",
       "swap.error.not_enough_balance": "Pas assez de solde pour le swap ou pour les frais!",
       "swap.error.swap_chain_not_supported": "La reseaux que vous demandez n'est pas prise en charge!",
+      "swap.coingrig_fee": "Coingrig charge",
 
       "nft.description": "Description",
       "nft.no_description": "Pas de description",
       "nft.created_date": "Créé le",
       "nft.sales": "Ventes",
       "nft.symbol": "Symbol",
-      "nft.total_supply": "Volume total"
+      "nft.total_supply": "Volume total",
+
+      "token_connect.title": "TokenConnect",
+      "token_connect.error.invalid_link_configuration": "Le lien utilisé n'est pas valide !",
+      "token_connect.swapintro_one": "Pour le swap souhaité, le token suivant doit être ajouté dans votre portefeuille",
+      "token_connect.swapintro_other": "Pour le swap souhaité, les jetons suivants doivent être ajoutés dans votre portefeuille",
+      "token_connect.add_asset_one": "Ajoutez token",
+      "token_connect.add_asset_other": "Ajoutez tokens"
   }
 }

src/i18n/languages/ro.json

@@ -216,12 +216,20 @@
       "swap.error.swap_not_found": "Nu există swap pentru această pereche!",
       "swap.error.not_enough_balance": "Balanță insuficientă pentru swap sau comision.",
       "swap.error.swap_chain_not_supported": "Rețeaua dorită nu este suportată!",
+      "swap.coingrig_fee": "Comision Coingrig",
 
       "nft.description": "Descriere",
       "nft.no_description": "Fără descriere",
       "nft.created_date": "Creat",
       "nft.sales": "Vânzări",
       "nft.symbol": "Simbol",
-      "nft.total_supply": "Volum total"
+      "nft.total_supply": "Volum total",
+
+      "token_connect.title": "TokenConnect",
+      "token_connect.error.invalid_link_configuration": "Link-ul folosit nu este valid!",
+      "token_connect.swapintro_one": "Pentru schimbul dorit, următorul token trebuie adăugat în portofoliu",
+      "token_connect.swapintro_other": "Pentru schimbul dorit, următorii tokeni trebuie adăugați în portofoliu",
+      "token_connect.add_asset_one": "Adaugă Token",
+      "token_connect.add_asset_other": "Adaugă Tokeni"
   }
 }

src/routes/index.tsx

@@ -32,6 +32,7 @@ import CoinDetailScreen from 'screens/CoinDetails';
 import OnBoardingScreen from 'screens/Onboarding';
 import WalletconnectScreen from 'screens/Walletconnect';
 import CustomTokenScreen from 'screens/CustomToken';
+import TokenConnectScreen from 'screens/TokenConnect';
 import NFTScreen from 'screens/Portfolio/NFTDetails';
 
 import {Colors} from 'utils/colors';
@@ -399,6 +400,40 @@ function NavigationStack({t}) {
           },
         }}
       />
+      <Stack.Screen
+        name="TokenConnectScreen"
+        component={TokenConnectScreen}
+        options={{
+          presentation: 'modal',
+          headerBackImage: () => (
+            <Icon
+              name="close"
+              size={30}
+              color={Colors.foreground}
+              style={{paddingLeft: 10}}
+            />
+          ),
+          headerShown: true,
+          headerTitle: t('token_connect.title'),
+          headerStyle: {
+            backgroundColor: Colors.darker,
+            shadowColor: 'transparent', // ios
+            elevation: 0, // android
+          },
+          headerTintColor: Colors.foreground,
+          headerBackTitleVisible: false,
+          headerBackTitleStyle: {
+            fontFamily: 'RobotoSlab-Regular',
+          },
+          headerTitleStyle: {
+            fontWeight: '400',
+
+            fontFamily: 'RobotoSlab-Regular',
+            fontSize: 19,
+            justifyContent: 'center',
+          },
+        }}
+      />
       <Stack.Screen
         name="CustomTokenScreen"
         component={CustomTokenScreen}