Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrading to WalletConnect v1.0.0-beta #3

Merged
merged 62 commits into from May 9, 2019
Merged
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
f3711cf
pedrouid: getting the dev environment up and running locally
pedrouid Feb 1, 2019
fa68654
uninstall rn-walletconnect-wallet
pedrouid Feb 1, 2019
18d1942
install @walletconnect/react-native
pedrouid Feb 1, 2019
206a2d8
first draft
pedrouid Feb 1, 2019
36fcc5f
bignumber, prettier, etc
pedrouid Feb 6, 2019
360c91a
create new firebase model, replace withAddWalletConnector with withIn…
pedrouid Feb 6, 2019
3dd4ce3
refactor walletConnectInitAllConnectors and walletConnectDisconnectAll
pedrouid Feb 6, 2019
b5f73a8
manually revert prettier changes
pedrouid Feb 6, 2019
f291c35
manually revert MORE prettier changes
pedrouid Feb 6, 2019
2abd172
resolve merge conflicts
pedrouid Feb 6, 2019
dfb2fac
reverting more prettier changes
pedrouid Feb 6, 2019
3ed7434
Merge pull request #405 from balance-io/pedrouid-refactor-walletconne…
pedrouid Feb 6, 2019
9b7f4d0
delete walletconnect model, delete addTransactionsToApprove, delete w…
pedrouid Feb 6, 2019
2969154
refactor walletConnectSendStatus
pedrouid Feb 6, 2019
900c14a
refactor push notifications, rename callData to payload, rename sessi…
pedrouid Feb 6, 2019
8007e23
rename callId to requestId
pedrouid Feb 6, 2019
86e4af6
refactor walletConnectInitNewSession and get chainId from settings re…
pedrouid Feb 7, 2019
c01d127
refactor Navigation.handleAction, add setTopLevelNavigator, add subcr…
pedrouid Feb 7, 2019
f92547e
differentiate payload from callData
pedrouid Feb 7, 2019
c9b6435
remove unused check
pedrouid Feb 7, 2019
d8ebce2
deleted connections model file (not used anywhere)
pedrouid Feb 7, 2019
c828b91
deleted personalData model file (not used anywhere)
pedrouid Feb 7, 2019
5b10304
refactor src/redux/walletconnect.js
pedrouid Feb 7, 2019
f6f08e4
typo
pedrouid Feb 7, 2019
2475db0
first draft walletconfirmation modal
pedrouid Feb 7, 2019
5ef52fb
change bundle identifier for testing
pedrouid Feb 7, 2019
3dc0153
install balance-common from pedrouid-walletconnect branch
pedrouid Feb 7, 2019
8fb54c6
refactor walletconnect reducer
pedrouid Feb 7, 2019
792bd92
rename callData to paylaod
pedrouid Feb 7, 2019
21db9b5
debug example.walletconnect.org connection
pedrouid Feb 8, 2019
c5fa16b
some more changes
pedrouid Feb 27, 2019
c1c8528
catching up with dev
jinchung Apr 23, 2019
73ee76a
bumping up common version
jinchung Apr 23, 2019
9bd243e
reverting some workspace specific settings
jinchung Apr 23, 2019
a51ebc9
cleanup
jinchung Apr 23, 2019
a7272d3
cleanup
jinchung Apr 23, 2019
36fdc72
cleanup
jinchung Apr 23, 2019
f7b9a29
cleanup
jinchung Apr 23, 2019
a86815a
updates for permissions checks
jinchung Apr 24, 2019
d9afb2f
TEMP STATE
jinchung Apr 24, 2019
cb1d0b6
connecting to walletconnect dapp
jinchung Apr 24, 2019
3c4a1ce
catching up with dev
jinchung Apr 26, 2019
274e788
bugfix for sending txn and status via walletconnect
jinchung Apr 26, 2019
b81cc04
store wc sessions
jinchung Apr 27, 2019
96f386b
logo to show up on confirmation page
jinchung Apr 27, 2019
7bfdcad
retrieving timestamp from json rpc from wc
jinchung Apr 27, 2019
aaafdf6
fix for rejecting call request
jinchung Apr 27, 2019
4f01342
fix for disabled button on coin request row while rest of row worked
jinchung Apr 27, 2019
a5f167d
loading saved requests from wc
jinchung Apr 27, 2019
efb96b0
clean up
jinchung Apr 27, 2019
5c791aa
relisten to socket when re-initialized on app open
jinchung Apr 28, 2019
e76b449
fixes for requests ordering
jinchung May 9, 2019
827ef41
catching up with dev
jinchung May 9, 2019
7440b65
clean
jinchung May 9, 2019
c56092a
bumping up version
jinchung May 9, 2019
4075af3
clean
jinchung May 9, 2019
731a183
cleanup
jinchung May 9, 2019
9925fed
cleanup
jinchung May 9, 2019
e03aeac
more cleanup
jinchung May 9, 2019
7ca2941
clean
jinchung May 9, 2019
371600b
cleanup
jinchung May 9, 2019
18c73b9
version update and changelog
jinchung May 9, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

catching up with dev

  • Loading branch information...
jinchung committed Apr 23, 2019
commit c1c852802b7bb834f635ca41569e5e74d7729f2b
@@ -32,6 +32,7 @@
"arrow-parens": ["off"],
"no-param-reassign": ["off"],
"react-native-animation-linter/must-tear-down-animations": 2,
"sort-keys": ["error", "asc", {"caseSensitive": false, "natural": false}]
},
"globals": {
"fetch": false
@@ -64,4 +64,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError

[version]
^0.75.0
^0.92.0
@@ -5,7 +5,7 @@ ios/GoogleService-Info.plist
#
.DS_Store
ios/Pods/
ios/BalanceWallet.app.dSYM.zip
ios/*dSYM.zip

# Xcode
#
@@ -59,3 +59,6 @@ buck-out/

# Bundle artifact
*.jsbundle

# Development Templates
src/screens/ExamplePage.js
@@ -6,14 +6,61 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/)

## [Unreleased]
### Added
* Autorefresh for unique tokens

### Changed
* Fix for app crashing when low ETH after having a previous wallet with enough ETH
* Fix for push notification not showing up when app completely closed
* Updated paging logic for transaction history
* Remove dropped/replaced transactions from pending state
* Fix crash that occurs when touching blank activity list below profile masthead while transactions still loading

### Removed

## [0.4.0-1](https://github.com/rainbow-me/rainbow/releases/tag/v0.4.0-1)
### Added
* 🌈
* 👍 feedback when a user copies address

### Changed
* Performance improvements to Activity List
* Improvements for send feedback
* Fixes for iPhone 6 users stuck in a loop with gas sheet when trying to send

### Removed
* Matomo

## [0.3.0-25](https://github.com/rainbow-me/rainbow/releases/tag/v0.3.0-25)
### Added
* WBTC pricing to rely on BTC price feed
* Proper implementation of box shadows

### Changed
* Improved Activity List interactions
* Fix for wrap-around behavior on Activity List
* Better handling for non-token-transfer and non-ETH smart contract interactions
* Fix for multiple push notifications permissions requests on initial WalletConnect connection

## [0.3.0-23](https://github.com/rainbow-me/rainbow/releases/tag/v0.3.0-23)
### Changed
* Fix for app crashing on fresh install for iPhone 6/7
* Fix for issue with multiple touch points causing weird behavior in expanded state
* Fix for blank transactions history while fetching transactions
* Fix for lengthy asset names on Send and Activity

## [0.3.0-22](https://github.com/rainbow-me/rainbow/releases/tag/v0.3.0-22)
### Added
* WalletConnect explainer
* Support for multiple builds

### Changed
* Fixes for navigation bugs
* Fix for delayed Importing notification after importing seed phrase
* Fix for showing seed phrase UI on older iPhones
* Update QR code scanner design

## [0.3.0-4](https://github.com/balance-io/balance-wallet/releases/tag/v0.3.0-4)
## [0.3.0-4](https://github.com/rainbow-me/rainbow/releases/tag/v0.3.0-4)

### Added
* Import seed phrase
@@ -24,12 +71,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
* Support for separate reducer changes for settings, assets, transactions, prices
* Support for promisified account refresh

## [0.3.0-3](https://github.com/balance-io/balance-wallet/releases/tag/v0.3.0-3)
## [0.3.0-3](https://github.com/rainbow-me/rainbow/releases/tag/v0.3.0-3)
### Changed
* Fix for toggle seed phrase button
* Fix for send native currency formatting

## [0.3.0-1](https://github.com/balance-io/balance-wallet/releases/tag/v0.3.0-1)
## [0.3.0-1](https://github.com/rainbow-me/rainbow/releases/tag/v0.3.0-1)
### Added
* Native currency selection in Settings
* Language selection in Settings (English and French only)
@@ -43,7 +90,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
* More consistent button behavior when confirming transactions
* Fixed haptic behavior when scanning QR code multiple times

## [0.2.1-3](https://github.com/balance-io/balance-wallet/releases/tag/v0.2.1-3)
## [0.2.1-3](https://github.com/rainbow-me/rainbow/releases/tag/v0.2.1-3)
### Added
* NFT attributes page
* Offline status indicator
@@ -1,12 +1,15 @@
# Balance Wallet
# Rainbow Wallet

A mobile wallet for dapps & tokens. Currently focused on iOS.
A mobile wallet for open finance and the decentralized web.

## Requirements

* A computer running macOS.
* NVM installed: https://github.com/creationix/nvm
* Install CocoaPods by running `sudo gem install cocoapods`
* Install Watchman `brew install watchman`
* Install the latest version of XCode: https://developer.apple.com/xcode/
* Clone and install Balance Common, our shared library: https://github.com/balance-io/balance-common
* Clone and install Rainbow Common, our shared library: https://github.com/rainbow-me/rainbow-common

## How to run the project

@@ -20,15 +23,13 @@ If you are new to React Native, this is a helpful introduction: https://facebook

4. Run `yarn nodeify`.

5. Install CocoaPods by running `sudo gem install cocoapods`.
5. Install required Pods by running `yarn install-pods`.

6. Install required Pods by running `yarn install-pods`.
6. Run `yarn ios` to build the project for XCode.

7. Run `yarn ios` to build the project for XCode.
7. Open `rainbow-wallet/ios/RainbowWallet.xcworkspace`.

8. Open `balance-wallet/ios/BalanceWallet.xcworkspace`.

9. Run the project by clicking the play button.
8. Run the project by clicking the play button.

## CodePush

@@ -44,7 +45,7 @@ At this point you will be required to log into the account tied to the code push

### Deployment
```
code-push release-react BalanceWallet-iOS ios -d <DEPLOYMENT>
code-push release-react RainbowWallet-iOS ios -d <DEPLOYMENT>
```

The deployment can either be `Staging` or `Production` depending on the mode of the application you wish to update was built in through XCode.
@@ -0,0 +1,14 @@
/**
* @format
*/

import 'react-native';
import React from 'react';
import App from '../App';

// Note: test renderer must be required after react-native.
import renderer from 'react-test-renderer';

it('renders correctly', () => {
renderer.create(<App />);
});
@@ -1,12 +1,14 @@
import 'react-native';
/**
* @format
*/

import 'react-native';
import React from 'react';
import App from '../App';

// Note: test renderer must be required after react-native.
// Note: test renderer must be required after react-native.
import renderer from 'react-test-renderer';

it('renders correctly', () => {
const tree = renderer.create(
<App />
);
it('renders correctly', () => {
renderer.create(<App />);
});
@@ -8,23 +8,13 @@
# - `buck install -r android/app` - compile, install and run application
#

load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")

lib_deps = []

for jarfile in glob(['libs/*.jar']):
name = 'jars__' + jarfile[jarfile.rindex('/') + 1: jarfile.rindex('.jar')]
lib_deps.append(':' + name)
prebuilt_jar(
name = name,
binary_jar = jarfile,
)
create_aar_targets(glob(["libs/*.aar"]))

for aarfile in glob(['libs/*.aar']):
name = 'aars__' + aarfile[aarfile.rindex('/') + 1: aarfile.rindex('.aar')]
lib_deps.append(':' + name)
android_prebuilt_aar(
name = name,
aar = aarfile,
)
create_jar_targets(glob(["libs/*.jar"]))

android_library(
name = "all-libs",
@@ -45,12 +35,12 @@ android_library(

android_build_config(
name = "build_config",
package = "com.balancewallet",
package = "com.rainbow",
)

android_resource(
name = "res",
package = "com.balancewallet",
package = "com.rainbow",
res = "src/main/res",
)

@@ -96,24 +96,25 @@ def enableProguardInReleaseBuilds = false

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

defaultConfig {
applicationId "com.balancewallet"
applicationId "com.rainbow"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
ndk {
abiFilters "armeabi-v7a", "x86"
}
}
splits {
abi {
reset()
enable enableSeparateBuildPerCPUArchitecture
universalApk false // If true, also generate a universal APK
include "armeabi-v7a", "x86"
include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
}
}
buildTypes {
@@ -141,7 +142,7 @@ android {
variant.outputs.each { output ->
// For each separate APK per architecture, set a unique version code as described here:
// http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
def versionCodes = ["armeabi-v7a":1, "x86":2]
def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3, "x86_64": 4]
def abi = output.getFilter(OutputFile.ABI)
if (abi != null) { // null for the universal-debug, universal-release variants
output.versionCodeOverride =
@@ -152,13 +153,21 @@ android {
}

dependencies {
implementation project(':react-native-firebase')
implementation project(':@staltz_react-native-tcp')
implementation project(':@react-native-community_blur')
implementation project(':@react-native-community_netinfo')
implementation project(':@react-native-community_async-storage')
implementation project(':react-native-camera')
compile project(':react-native-device-info')
compile project(':react-native-screens')
compile project(':react-native-version-number')
compile project(':react-native-matomo')
compile project(':react-native-fast-image')
compile project(':react-native-blur')
compile project(':react-native-languages')
compile project(':react-native-reanimated')
compile project(':react-native-gesture-handler')
compile project(':react-native-firebase')
compile project(':react-native-code-push')
compile project(':react-native-haptic-feedback')
compile project(':react-native-udp')
@@ -172,7 +181,6 @@ dependencies {
compile project(':react-native-mail')
compile project(':react-native-linear-gradient')
compile project(':react-native-keychain')
compile project(':react-native-camera')
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
compile "com.facebook.react:react-native:+" // From node_modules
@@ -0,0 +1,19 @@
"""Helper definitions to glob .aar and .jar targets"""

def create_aar_targets(aarfiles):
for aarfile in aarfiles:
name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")]
lib_deps.append(":" + name)
android_prebuilt_aar(
name = name,
aar = aarfile,
)

def create_jar_targets(jarfiles):
for jarfile in jarfiles:
name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")]
lib_deps.append(":" + name)
prebuilt_jar(
name = name,
binary_jar = jarfile,
)
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

<application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
</manifest>
@@ -1,13 +1,13 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.balancewallet">
package="com.rainbow">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

<application
android:name=".MainApplication"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
android:theme="@style/AppTheme">
<activity
@@ -1,3 +1,4 @@
<resources>
<string name="app_name">BalanceWallet Debug</string>
<string moduleConfig="true" name="reactNativeCodePush_androidDeploymentKey">deployment-key-here</string>
<string name="app_name">Rainbow Debug</string>
</resources>
@@ -1,4 +1,4 @@
package com.balancewallet;
package com.rainbow;

import com.facebook.react.ReactActivity;

@@ -10,6 +10,6 @@
*/
@Override
protected String getMainComponentName() {
return "BalanceWallet";
return "Rainbow";
}
}
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.