Merge pull request #3 from coingrig/develop

v1.1.0
coingrig · Nov 13, 2021 · 4267ea0 · 4267ea0
2 parents b0bea66 + 1ed183c
commit 4267ea0
Show file tree

Hide file tree

Showing 56 changed files with 2,084 additions and 545 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,45 @@
+name: CI
+on: [push,pull_request]
+jobs:
+  build-lint-audit-test:
+    name: Build and Lint
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        node-version: [14.x]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Get Yarn cache directory
+        run: |
+          YARN_CACHE_DIR=$(yarn cache dir)
+          echo $YARN_CACHE_DIR
+          echo "::set-output name=YARN_CACHE_DIR::$YARN_CACHE_DIR"
+        id: yarn-cache-dir
+      - name: Get Node version
+        run: |
+          node -v
+      - name: Get Yarn version
+        run: |
+          YARN_VERSION=$(yarn --version)
+          echo $YARN_VERSION
+          echo "::set-output name=YARN_VERSION::$YARN_VERSION"
+        id: yarn-version
+      - name: Cache yarn dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarn-cache-dir.outputs.YARN_CACHE_DIR }}
+          key: yarn-cache-${{ runner.os }}-${{ steps.yarn-version.outputs.YARN_VERSION }}-${{ hashFiles('yarn.lock') }}
+      - run: yarn --frozen-lockfile
+      - run: yarn lint
+      # - run: yarn audit:ci
+  all-jobs-pass:
+    name: All jobs pass
+    runs-on: ubuntu-20.04
+    needs:
+      - build-lint-audit-test
+    steps:
+      - run: echo "Great success!"
diff --git a/App.js b/App.js
@@ -1,7 +1,8 @@
 import React from 'react';
 import {Platform, StatusBar} from 'react-native';
 import {NavigationContainer} from '@react-navigation/native';
-import AppStateServices from './src/services/appStates';
+// eslint-disable-next-line no-unused-vars
+import AppsStateService from './src/services/appStates';
 import {NavigationScreens} from './src/routes';
 import {SafeAreaProvider} from 'react-native-safe-area-context';
 import {LoadingSheet} from './src/components/loadingSheet';

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,24 +6,24 @@
 
 You can contribute to Coingrig Mobile Wallet in various ways, including:  
 
--  [Reporting bugs or issues](https://github.com/coingrig/mobile-wallet/issues/new) on GitHub. Please make sure to include fill in all the details in the issue template to make sure the issue can be addressed as quickly as possible.
+-  [Reporting bugs or issues](https://github.com/coingrig/coingrig-wallet/issues/new) on GitHub. Please make sure to include fill in all the details in the issue template to make sure the issue can be addressed as quickly as possible.
 
 -  Submitting improvements to the documentation
 Updates, enhancements, new guides, spelling fixes...
 
-- Helping other people on the [discussions](https://github.com/coingrig/mobile-wallet/discussions).
+- Helping other people on the [discussions](https://github.com/coingrig/coingrig-wallet/discussions).
 
-- Looking at existing [issues](https://github.com/coingrig/mobile-wallet/issues) and adding more information, particularly helping to reproduce the issues.
+- Looking at existing [issues](https://github.com/coingrig/coingrig-wallet/issues) and adding more information, particularly helping to reproduce the issues.
 
--  [Submitting a pull request](https://github.com/coingrig/mobile-wallet/pulls) with a bug fix or an improvement.
+-  [Submitting a pull request](https://github.com/coingrig/coingrig-wallet/pulls) with a bug fix or an improvement.
 
 
 
 ## Coingrig Mobile Wallet repository
 
 
 
-The [Coingrig Mobile Wallet GitHub repository](https://github.com/coingrig/mobile-wallet) contains the packages that make up Coingrig Mobile Wallet.
+The [Coingrig Mobile Wallet GitHub repository](https://github.com/coingrig/coingrig-wallet) contains the packages that make up Coingrig Mobile Wallet.
 
 
 ### Branches
@@ -44,7 +44,7 @@ Keeping the `develop` releasable means that changes merged to it need to be:
 
 To submit a pull request:  
 
-1. Fork the [repository](https://github.com/coingrig/mobile-wallet) and create a feature branch. (Existing contributors can create feature branches without forking. Prefix the branch name with `@your-github-username/`.)
+1. Fork the [repository](https://github.com/coingrig/coingrig-wallet) and create a feature branch. (Existing contributors can create feature branches without forking. Prefix the branch name with `@your-github-username/`.)
 
 2. Write the description of your pull request. Make sure to include a test plan and test your changes.
 

diff --git a/README.md b/README.md
@@ -22,8 +22,8 @@ sudo gem install cocoapods
 -   Clone this repo and install our dependencies:
 
 ```bash
-git clone https://github.com/coingrig/mobile-wallet
-cd mobile-wallet
+git clone https://github.com/coingrig/coingrig-wallet
+cd coingrig-wallet
 yarn # this will install all dependecies
 cd ios && pod install && cd .. # install pods for iOS
 ```

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -134,8 +134,8 @@ android {
         applicationId "com.coingrig"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 21
-        versionName "1.0"
+        versionCode 26
+        versionName "1.1.0"
         missingDimensionStrategy 'react-native-camera', 'general'
 
     }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:launchMode="singleTask"
+        android:screenOrientation="portrait"
         android:windowSoftInputMode="adjustResize">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />

diff --git a/ios/Coingrig.xcodeproj/project.pbxproj b/ios/Coingrig.xcodeproj/project.pbxproj
@@ -630,7 +630,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = L63HFFVTBZ;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -707,6 +707,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -730,7 +731,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = L63HFFVTBZ;
 				"HEADER_SEARCH_PATHS[arch=*]" = (
 					"$(inherited)",
@@ -806,6 +807,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -853,7 +855,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;
@@ -918,7 +920,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;

diff --git a/ios/Coingrig/Info.plist b/ios/Coingrig/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -634,7 +634,7 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
   FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
-  FBReactNativeSpec: 76d980b28327a20f3c604f1101655e71999399be
+  FBReactNativeSpec: 5a6b75a68b0b65cdcb7a94b7880e0b0f866bfd50
   Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
@@ -702,4 +702,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 2379ffdef8f392d2f93fd5d042782d221483ca02
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coingrig",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "android": "npx react-native run-android",
@@ -12,8 +12,19 @@
     "clean": "rm -rf node_modules/ && yarn && cd ios && pod update && cd .. && cd android && ./gradlew clean",
     "postinstall": "rn-nodeify --install http,https,path,crypto,fs,stream,os --hack"
   },
+  "keywords": [
+    "crypto",
+    "bitcoin",
+    "wallet",
+    "typescript"
+  ],
+  "homepage": "https://coingrig.com",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/coingrig/coingrig-wallet.git"
+  },
   "dependencies": {
-    "@coingrig/core": "^1.0.0",
+    "@coingrig/core": "1.1.0",
     "@haskkor/react-native-pincode": "1.22.6",
     "@rainbow-me/animated-charts": "1.0.0-alpha.5",
     "@react-native-async-storage/async-storage": "1.15.7",
@@ -26,6 +37,7 @@
     "assert": "^2.0.0",
     "asyncstorage-down": "4.2.0",
     "axios": "0.21.1",
+    "bignumber.js": "^9.0.1",
     "browserify-sign": "^4.2.1",
     "decimal.js": "10.3.1",
     "events": "^3.3.0",
@@ -45,6 +57,7 @@
     "react-native": "0.64.2",
     "react-native-actions-sheet": "0.5.4",
     "react-native-animatable": "1.3.3",
+    "react-native-big-list": "^1.4.3",
     "react-native-camera": "4.2.0",
     "react-native-chart-kit": "6.11.0",
     "react-native-crypto": "2.2.0",
@@ -57,9 +70,11 @@
     "react-native-iphone-x-helper": "1.3.1",
     "react-native-keychain": "8.0.0",
     "react-native-level-fs": "3.0.1",
+    "react-native-logs": "^3.0.4",
     "react-native-os": "1.2.6",
     "react-native-pager-view": "5.4.1",
     "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",

diff --git a/shim.js b/shim.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 if (typeof __dirname === 'undefined') {
   global.__dirname = '/';
 }

diff --git a/src/assets/fulltokens.json b/src/assets/fulltokens.json
diff --git a/src/components/Receive/index.tsx b/src/components/Receive/index.tsx
@@ -6,6 +6,7 @@ import {styles} from './styles';
 import Share from 'react-native-share';
 import {BigButton} from 'components/bigButton';
 import {Colors} from 'utils/colors';
+import {CryptoService} from 'services/crypto';
 
 export function ReceiveContainer(props) {
   const [imageUri, setImageUri] = useState<any>(null);
@@ -20,6 +21,7 @@ export function ReceiveContainer(props) {
         setImageUri(response);
       })
       .catch(err => console.log('Cannot create QR code', err));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const shareAddress = async () => {
@@ -44,7 +46,23 @@ export function ReceiveContainer(props) {
           selectable>
           {props.address}
         </Text>
+        <View
+          style={{
+            backgroundColor: Colors.darker,
+            borderRadius: 5,
+            paddingHorizontal: 10,
+            paddingVertical: 5,
+            justifyContent: 'center',
+            alignSelf: 'center',
+          }}>
+          <Text style={{fontSize: 11, color: Colors.lighter}}>
+            {CryptoService.getSupportedChainNamebyID(props.chain) +
+              ' ' +
+              t('wallet.network')}
+          </Text>
+        </View>
       </View>
+
       <View style={styles.share}>
         <BigButton
           text={t('tx.share_address')}