Skip to content

Commit

Permalink
Merge pull request #11 from coingrig/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
florindumitru authored Jan 29, 2022
2 parents 0f32517 + 1daccdd commit 2bad61d
Show file tree
Hide file tree
Showing 81 changed files with 2,832 additions and 516 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,5 @@ buck-out/
# CocoaPods
/ios/Pods/
src/config.js
ios/AppCenter-Config.plist
android/app/src/main/assets/appcenter-config.json
3 changes: 2 additions & 1 deletion App.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {MenuProvider} from 'react-native-popup-menu';
import {NavigationScreens} from './src/routes';
import {SafeAreaProvider} from 'react-native-safe-area-context';
import {LoadingSheet} from './src/components/loadingSheet';
import Door from './src/components/Door';
import FlashMessage from 'react-native-flash-message';
import {Colors} from './src/utils/colors';

Expand All @@ -30,9 +31,9 @@ function App() {
<MenuProvider>
<NavigationScreens />
</MenuProvider>

<FlashMessage position="top" />
<LoadingSheet />
<Door />
</NavigationContainer>
</SafeAreaProvider>
);
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ android {
applicationId "com.coingrig"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 41
versionName "1.3.4"
versionCode 48
versionName "1.3.5"
missingDimensionStrategy 'react-native-camera', 'general'

}
Expand Down
2 changes: 2 additions & 0 deletions android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<resources>
<string name="app_name">Coingrig</string>
<string name="appCenterCrashes_whenToSendCrashes" moduleConfig="true" translatable="false">DO_NOT_ASK_JAVASCRIPT</string>
<string name="appCenterAnalytics_whenToEnableAnalytics" moduleConfig="true" translatable="false">ALWAYS_SEND</string>
</resources>
2 changes: 2 additions & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

AsyncStorage_db_size_in_MB=12

# Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.75.1
org.gradle.jvmargs=-Xmx4608m
16 changes: 10 additions & 6 deletions ios/Coingrig.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
4E5404AD26CD83330055EE3E /* RobotoSlab-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4E5404A426CD83320055EE3E /* RobotoSlab-Regular.ttf */; };
4E5404AE26CD83330055EE3E /* RobotoSlab-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4E5404A526CD83320055EE3E /* RobotoSlab-Black.ttf */; };
4E5404AF26CD83330055EE3E /* RobotoSlab-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4E5404A626CD83330055EE3E /* RobotoSlab-Thin.ttf */; };
4E7FF0F327A28031007C17D2 /* AppCenter-Config.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4E7FF0F227A28031007C17D2 /* AppCenter-Config.plist */; };
5BBFAFBAD85CB9128AC703B4 /* libPods-Coingrig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 87AEA7FC882C6B7889BFB6C8 /* libPods-Coingrig.a */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
A60153BE27730D61000A5391 /* lock.xib in Resources */ = {isa = PBXBuildFile; fileRef = A60153BD27730D61000A5391 /* lock.xib */; };
Expand Down Expand Up @@ -64,6 +65,7 @@
4E5404A426CD83320055EE3E /* RobotoSlab-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "RobotoSlab-Regular.ttf"; path = "../src/assets/fonts/RobotoSlab-Regular.ttf"; sourceTree = "<group>"; };
4E5404A526CD83320055EE3E /* RobotoSlab-Black.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "RobotoSlab-Black.ttf"; path = "../src/assets/fonts/RobotoSlab-Black.ttf"; sourceTree = "<group>"; };
4E5404A626CD83330055EE3E /* RobotoSlab-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "RobotoSlab-Thin.ttf"; path = "../src/assets/fonts/RobotoSlab-Thin.ttf"; sourceTree = "<group>"; };
4E7FF0F227A28031007C17D2 /* AppCenter-Config.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "AppCenter-Config.plist"; sourceTree = "<group>"; };
4ECEF88926CC36B80069C5C1 /* Fontisto.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Fontisto.ttf; sourceTree = "<group>"; };
4ECEF88A26CC36B80069C5C1 /* Octicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Octicons.ttf; sourceTree = "<group>"; };
4ECEF88B26CC36B80069C5C1 /* Feather.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Feather.ttf; sourceTree = "<group>"; };
Expand Down Expand Up @@ -252,6 +254,7 @@
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
4E7FF0F227A28031007C17D2 /* AppCenter-Config.plist */,
A67F9FD926E782FA00CC9AD1 /* test.swift */,
4E5404A526CD83320055EE3E /* RobotoSlab-Black.ttf */,
4E54049E26CD83320055EE3E /* RobotoSlab-Bold.ttf */,
Expand Down Expand Up @@ -384,6 +387,7 @@
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
4E5404A726CD83330055EE3E /* RobotoSlab-Bold.ttf in Resources */,
4E5404A826CD83330055EE3E /* RobotoSlab-ExtraLight.ttf in Resources */,
4E7FF0F327A28031007C17D2 /* AppCenter-Config.plist in Resources */,
4E5404A926CD83330055EE3E /* RobotoSlab-ExtraBold.ttf in Resources */,
4E5404AA26CD83330055EE3E /* RobotoSlab-Light.ttf in Resources */,
A60153BE27730D61000A5391 /* lock.xib in Resources */,
Expand Down Expand Up @@ -637,7 +641,7 @@
CODE_SIGN_ENTITLEMENTS = Coingrig/Coingrig.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 41;
CURRENT_PROJECT_VERSION = 48;
DEVELOPMENT_TEAM = L63HFFVTBZ;
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
Expand Down Expand Up @@ -714,7 +718,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.3.4;
MARKETING_VERSION = 1.3.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -739,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 = 41;
CURRENT_PROJECT_VERSION = 48;
DEVELOPMENT_TEAM = L63HFFVTBZ;
"HEADER_SEARCH_PATHS[arch=*]" = (
"$(inherited)",
Expand Down Expand Up @@ -815,7 +819,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.3.4;
MARKETING_VERSION = 1.3.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -863,7 +867,7 @@
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -928,7 +932,7 @@
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand Down
7 changes: 7 additions & 0 deletions ios/Coingrig/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
#import <React/RCTRootView.h>
#import "RNSplashScreen.h" // here
#import <React/RCTLinkingManager.h>
#import <AppCenterReactNative.h>
#import <AppCenterReactNativeAnalytics.h>
#import <AppCenterReactNativeCrashes.h>

#ifdef FB_SONARKIT_ENABLED
#import <FlipperKit/FlipperClient.h>
Expand Down Expand Up @@ -33,6 +36,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
InitializeFlipper(application);
#endif

[AppCenterReactNative register];
[AppCenterReactNativeAnalytics registerWithInitiallyEnabled:true];
[AppCenterReactNativeCrashes registerWithAutomaticProcessing];

RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
moduleName:@"Coingrig"
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require_relative '../node_modules/react-native/scripts/react_native_pods'
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

platform :ios, '10.0'
platform :ios, '11.0'

target 'Coingrig' do
config = use_native_modules!
Expand Down
46 changes: 40 additions & 6 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
PODS:
- appcenter-analytics (4.4.3):
- AppCenter/Analytics (~> 4.0)
- AppCenterReactNativeShared (~> 4.0)
- React-Core
- appcenter-core (4.4.3):
- AppCenterReactNativeShared (~> 4.0)
- React-Core
- appcenter-crashes (4.4.3):
- AppCenter/Crashes (~> 4.0)
- AppCenterReactNativeShared (~> 4.0)
- React-Core
- AppCenter/Analytics (4.4.1):
- AppCenter/Core
- AppCenter/Core (4.4.1)
- AppCenter/Crashes (4.4.1):
- AppCenter/Core
- AppCenterReactNativeShared (4.4.3):
- AppCenter/Core (= 4.4.1)
- boost-for-react-native (1.63.0)
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
Expand Down Expand Up @@ -414,9 +432,9 @@ PODS:
- React
- RNVectorIcons (7.1.0):
- React
- SDWebImage (5.12.1):
- SDWebImage/Core (= 5.12.1)
- SDWebImage/Core (5.12.1)
- SDWebImage (5.12.2):
- SDWebImage/Core (= 5.12.2)
- SDWebImage/Core (5.12.2)
- SDWebImageWebPCoder (0.6.1):
- libwebp (~> 1.0)
- SDWebImage/Core (~> 5.7)
Expand All @@ -427,6 +445,9 @@ PODS:
- Yoga (~> 1.14)

DEPENDENCIES:
- appcenter-analytics (from `../node_modules/appcenter-analytics/ios`)
- appcenter-core (from `../node_modules/appcenter/ios`)
- appcenter-crashes (from `../node_modules/appcenter-crashes/ios`)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
Expand Down Expand Up @@ -506,6 +527,8 @@ DEPENDENCIES:

SPEC REPOS:
trunk:
- AppCenter
- AppCenterReactNativeShared
- boost-for-react-native
- CocoaAsyncSocket
- Flipper
Expand All @@ -523,6 +546,12 @@ SPEC REPOS:
- YogaKit

EXTERNAL SOURCES:
appcenter-analytics:
:path: "../node_modules/appcenter-analytics/ios"
appcenter-core:
:path: "../node_modules/appcenter/ios"
appcenter-crashes:
:path: "../node_modules/appcenter-crashes/ios"
DoubleConversion:
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
FBLazyVector:
Expand Down Expand Up @@ -635,11 +664,16 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
AppCenter: b0b6f1190215b5f983c42934db718f3b46fff3c0
appcenter-analytics: 1b32062da2e250c5e1396c678df8c6011ccbcf5a
appcenter-core: 6ea4754df4a3d8917a5803e2681a58179d7f7a21
appcenter-crashes: b079913ac0f0059e6cf39b7a805135223e508666
AppCenterReactNativeShared: ac6961204492735ce2507df0a14ce59b13e9c1c5
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
FBReactNativeSpec: 6f4010c716a5b029c606cb6dc9ec523cdaeaa72c
FBReactNativeSpec: 5a6b75a68b0b65cdcb7a94b7880e0b0f866bfd50
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
Expand Down Expand Up @@ -700,12 +734,12 @@ SPEC CHECKSUMS:
RNSmartCode: b7410d659677d180a640e850e15eb4980d744d70
RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b
SDWebImage: 240e5c12b592fb1268c1d03b8c90d90e8c2ffe82
SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21
TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 2379ffdef8f392d2f93fd5d042782d221483ca02
PODFILE CHECKSUM: 261d72b3fd2a751cdf1a044c1de16e08f8187fc1

COCOAPODS: 1.11.2
13 changes: 9 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "coingrig",
"version": "1.3.4",
"version": "1.3.5",
"private": true,
"scripts": {
"android": "npx react-native run-android",
Expand Down Expand Up @@ -37,8 +37,11 @@
"@walletconnect/client": "^1.6.6",
"@walletconnect/types": "^1.6.6",
"@walletconnect/utils": "^1.6.6",
"appcenter": "^4.4.3",
"appcenter-analytics": "^4.4.3",
"appcenter-crashes": "^4.4.3",
"assert": "^2.0.0",
"asyncstorage-down": "4.2.0",
"asyncstorage-down": "https://github.com/coingrig/asyncstorage-down.git",
"axios": "0.21.1",
"bignumber.js": "^9.0.1",
"browserify-sign": "^4.2.1",
Expand All @@ -65,6 +68,7 @@
"react-native-chart-kit": "6.11.0",
"react-native-crypto": "2.2.0",
"react-native-device-info": "8.3.1",
"react-native-dialog": "^9.2.0",
"react-native-encrypted-storage": "4.0.2",
"react-native-fast-image": "8.3.7",
"react-native-flash-message": "^0.2.0",
Expand All @@ -77,11 +81,13 @@
"react-native-logs": "^3.0.4",
"react-native-os": "1.2.6",
"react-native-pager-view": "5.4.1",
"react-native-parallax-scroll-view": "^0.21.3",
"react-native-permissions": "3.0.5",
"react-native-popup-menu": "^0.15.11",
"react-native-qrcode-scanner": "1.5.4",
"react-native-randombytes": "3.6.1",
"react-native-reanimated": "2.0.0",
"react-native-resegmented-control": "^2.4.0",
"react-native-restart": "0.0.22",
"react-native-rss-parser": "^1.5.1",
"react-native-safe-area-context": "3.3.2",
Expand All @@ -95,8 +101,7 @@
"react-native-vector-icons": "7.1.0",
"readable-stream": "1.0.33",
"stream-browserify": "^3.0.0",
"url": "^0.11.0",
"use-count-up": "^3.0.1"
"url": "^0.11.0"
},
"devDependencies": {
"@babel/core": "7.15.0",
Expand Down
Binary file added src/assets/hub/card.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/hub/connector.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/hub/exchange.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 modified src/assets/hub/savings.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 removed src/assets/hub/swap.png
Binary file not shown.
Binary file added src/assets/nft.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/no-nft.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/opensea.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2bad61d

Please sign in to comment.