Skip to content
This repository has been archived by the owner on Oct 12, 2023. It is now read-only.

Commit

Permalink
fix: fixes on v2.0.1 and bump
Browse files Browse the repository at this point in the history
  • Loading branch information
patogallaiovlabs committed Jun 29, 2021
1 parent 3d57be8 commit 43cfd93
Show file tree
Hide file tree
Showing 16 changed files with 72 additions and 118 deletions.
53 changes: 26 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.1.1)
aws-partitions (1.460.0)
aws-sdk-core (3.114.0)
aws-partitions (1.472.0)
aws-sdk-core (3.115.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.43.0)
aws-sdk-kms (1.44.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.94.1)
aws-sdk-s3 (1.96.1)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
Expand Down Expand Up @@ -90,8 +90,10 @@ GEM
escape (0.0.4)
ethon (0.14.0)
ffi (>= 1.15.0)
excon (0.81.0)
faraday (1.4.1)
excon (0.83.0)
faraday (1.4.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
Expand All @@ -107,8 +109,8 @@ GEM
faraday-net_http_persistent (1.1.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
fastimage (2.2.3)
fastlane (2.183.2)
fastimage (2.2.4)
fastlane (2.187.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -152,39 +154,36 @@ GEM
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.3.0)
google-apis-core (~> 0.1)
google-apis-core (0.3.0)
google-apis-androidpublisher_v3 (0.7.0)
google-apis-core (>= 0.3, < 2.a)
google-apis-core (0.4.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.14)
httpclient (>= 2.8.1, < 3.0)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
retriable (>= 2.0, < 4.a)
rexml
signet (~> 0.14)
webrick
google-apis-iamcredentials_v1 (0.4.0)
google-apis-core (~> 0.1)
google-apis-playcustomapp_v1 (0.3.0)
google-apis-core (~> 0.1)
google-apis-playcustomapp_v1 (0.2.0)
google-apis-core (~> 0.1)
google-apis-storage_v1 (0.3.0)
google-apis-core (~> 0.1)
google-apis-iamcredentials_v1 (0.5.0)
google-apis-core (>= 0.3, < 2.a)
google-apis-playcustomapp_v1 (0.4.0)
google-apis-core (>= 0.3, < 2.a)
google-apis-storage_v1 (0.5.0)
google-apis-core (>= 0.3, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.5.0)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.1.0)
google-cloud-storage (1.31.1)
google-cloud-storage (1.32.0)
addressable (~> 2.5)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.1)
google-cloud-core (~> 1.2)
googleauth (~> 0.9)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (0.16.2)
faraday (>= 0.17.3, < 2.0)
Expand All @@ -194,7 +193,7 @@ GEM
os (>= 0.9, < 2.0)
signet (~> 0.14)
highline (2.0.3)
http-cookie (1.0.3)
http-cookie (1.0.4)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.8.10)
Expand Down
6 changes: 3 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
compileSdkVersion rootProject.ext.compileSdkVersion
versionCode 45
versionName "1.4.5"
versionCode 48
versionName "2.0.1"
missingDimensionStrategy 'react-native-camera', 'general'
multiDexEnabled true
}
Expand Down Expand Up @@ -213,4 +213,4 @@ task copyDownloadableDepsToLibs(type: Copy) {
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

// apply plugin: 'com.google.gms.google-services' must be at the bottom of the file
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.gms.google-services'
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.rsk.rwallet.v2"
android:versionCode="7"
android:versionName="1.4.5">
android:versionName="2.0.1">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ platform :android do
desc 'Build the Android application.'
private_lane :build do
gradle(task: 'clean', project_dir: 'android/')
gradle(task: 'assemble', build_type: 'Release', project_dir: 'android/', properties: {
gradle(task: 'bundle', build_type: 'Release', project_dir: 'android/', properties: {
"android.injected.signing.store.file" => Dir.pwd + "/../" + ENV['ANDROID_SIGN_FILE'],
"android.injected.signing.store.password" => ENV['ANDROID_SIGN_PASSWORD'],
"android.injected.signing.key.alias" => ENV['ANDROID_SIGN_KEY_ALIAS'],
Expand Down
4 changes: 2 additions & 2 deletions ios/rwallet-tvOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.5</string>
<string>2.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>46</string>
<string>47</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
Expand Down
4 changes: 2 additions & 2 deletions ios/rwallet-tvOSTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.5</string>
<string>2.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>46</string>
<string>47</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions ios/rwallet.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@
CODE_SIGN_ENTITLEMENTS = rwallet/rwallet.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 46;
CURRENT_PROJECT_VERSION = 47;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = 3YDAH8ZR7C;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -933,7 +933,7 @@
CODE_SIGN_ENTITLEMENTS = rwallet/rwallet.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 46;
CURRENT_PROJECT_VERSION = 47;
DEVELOPMENT_TEAM = 3YDAH8ZR7C;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down
6 changes: 4 additions & 2 deletions ios/rwallet/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>UIUserInterfaceStyle</key>
<string>Light</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
Expand All @@ -17,11 +19,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.5</string>
<string>2.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>46</string>
<string>47</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
Expand Down
4 changes: 2 additions & 2 deletions ios/rwalletTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.5</string>
<string>2.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>46</string>
<string>47</string>
</dict>
</plist>
7 changes: 6 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rwallet",
"version": "1.4.5",
"version": "2.0.1",
"private": true,
"scripts": {
"postinstall": "./node_modules/.bin/rn-nodeify --hack --install stream,http,https,crypto,os,url && ./node_modules/.bin/patch-package",
Expand All @@ -19,6 +19,7 @@
"dependencies": {
"@ant-design/react-native": "^4.2.0",
"@react-native-async-storage/async-storage": "^1.15.5",
"@react-native-clipboard/clipboard": "^1.8.2",
"@react-native-community/blur": "^3.6.0",
"@react-native-community/cameraroll": "^4.0.4",
"@react-native-community/segmented-control": "^2.2.2",
Expand Down
11 changes: 9 additions & 2 deletions src/pages/wallet/recovery.phrase.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import _ from 'lodash';
import React, { Component } from 'react';
import {
View, TouchableOpacity, StyleSheet, Clipboard,
View, TouchableOpacity, StyleSheet,
} from 'react-native';
import Clipboard from '@react-native-clipboard/clipboard';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import Tags from '../../components/common/misc/tags';
Expand Down Expand Up @@ -143,7 +144,13 @@ RecoveryPhrase.propTypes = {
navigate: PropTypes.func.isRequired,
dispatch: PropTypes.func.isRequired,
goBack: PropTypes.func.isRequired,
state: PropTypes.object.isRequired,
state: PropTypes.shape({
params: PropTypes.shape({
shouldVerifyPhrase: PropTypes.bool.isRequired,
shouldCreatePhrase: PropTypes.bool.isRequired,
phrase: PropTypes.string.isRequired,
}).isRequired,
}).isRequired,
}).isRequired,
addNotification: PropTypes.func.isRequired,
};
Expand Down
12 changes: 8 additions & 4 deletions src/pages/wallet/rns/status.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ const styles = StyleSheet.create({
class RnsStatus extends Component {
static navigationOptions = () => ({
header: null,
gesturesEnabled: false,
gestureEnabled: false,
});

constructor(props) {
Expand All @@ -135,7 +135,7 @@ class RnsStatus extends Component {
this.createListData();
}

componentWillReceiveProps(nextProps) {
UNSAFE_componentWillReceiveProps(nextProps) {
const { subdomains } = nextProps;
const { rnsRows } = this.state;
const newRnsRows = this.getUpdatedSubdomainsStatus(subdomains, rnsRows);
Expand Down Expand Up @@ -344,10 +344,14 @@ RnsStatus.propTypes = {
dispatch: PropTypes.func.isRequired,
goBack: PropTypes.func.isRequired,
pop: PropTypes.func.isRequired,
state: PropTypes.object.isRequired,
state: PropTypes.shape({
params: PropTypes.shape({
isSkipCreatePage: PropTypes.bool.isRequired,
}).isRequired,
}).isRequired,
}).isRequired,
walletManager: PropTypes.shape({
wallets: PropTypes.array,
wallets: PropTypes.arrayOf(PropTypes.shape({})),
}).isRequired,
addNotification: PropTypes.func.isRequired,
setPage: PropTypes.func.isRequired,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/wallet/transfer.js
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ const styles = StyleSheet.create({
class Transfer extends Component {
static navigationOptions = () => ({
header: null,
gesturesEnabled: false,
gestureEnabled: false,
});

static generateAmountPlaceholderText(symbol, type, currency, prices) {
Expand Down
Loading

0 comments on commit 43cfd93

Please sign in to comment.