Skip to content

Commit

Permalink
Merge branch 'develop' into us-2157
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigoncalves committed Mar 23, 2024
2 parents c478eab + f7139fe commit 5f93ae4
Show file tree
Hide file tree
Showing 94 changed files with 5,517 additions and 4,878 deletions.
6 changes: 0 additions & 6 deletions .buckconfig

This file was deleted.

2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ RIF_WALLET_KEY=RIF_WALLET
WALLETCONNECT2_PROJECT_ID=d9224e919473fd749ba8298879ce7569

USE_RELAY=true

TRACE_ID=
2 changes: 2 additions & 0 deletions .env.local
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ DEFAULT_CHAIN_TYPE=TESTNET

RIF_WALLET_KEY=RIF_WALLET
WALLETCONNECT2_PROJECT_ID=d9224e919473fd749ba8298879ce7569

TRACE_ID=
2 changes: 2 additions & 0 deletions .env.local.android
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ DEFAULT_CHAIN_TYPE=TESTNET

RIF_WALLET_KEY=RIF_WALLET
WALLETCONNECT2_PROJECT_ID=d9224e919473fd749ba8298879ce7569

TRACE_ID=
2 changes: 2 additions & 0 deletions .env.test
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ DEFAULT_CHAIN_TYPE=TESTNET

RIF_WALLET_KEY=RIF_WALLET
WALLETCONNECT2_PROJECT_ID=d9224e919473fd749ba8298879ce7569

TRACE_ID=
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
root: true,
extends: [
'@react-native-community',
'@react-native',
'plugin:react/jsx-runtime',
'plugin:@typescript-eslint/recommended',
],
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Use Node.js 16.x
- name: Use Node.js 18.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 18.x

- name: Install dependencies
run: yarn
Expand Down
14 changes: 8 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,15 @@ local.properties
*.iml
*.hprof
.cxx/
*.keystore
!debug.keystore

# node.js
#
node_modules/
npm-debug.log
yarn-error.log

# BUCK
buck-out/
\.buckd/
*.keystore
!debug.keystore

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
Expand All @@ -62,5 +58,11 @@ buck-out/
# Ruby / CocoaPods
/ios/Pods/

# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*

# testing
/coverage

coverage
/vendor/bundle/
1 change: 0 additions & 1 deletion .node-version

This file was deleted.

12 changes: 7 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
source 'https://rubygems.org'

# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby '>= 2.6.10'

gem 'cocoapods', '>= 1.11.3'
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
ruby ">= 2.6.10"

# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
# bound in the template on Cocoapods with next React Native release.
gem 'cocoapods', '>= 1.13', '< 1.15'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ The main use case of the RIF Wallet using account abstraction is to pay the gas
- Install the dependecies using yarn. This will also run the postinstall script that shims the missing packages: `yarn`
- The postinstall script runs the `rn-nodeify` package which adds packages that are native to the browser but not to react native.
- For **iOS** you need to run the additional installation steps: `cd ios` and then `pod install`
- Set the environment variable `TRACE_ID` in `.env` file to connect with backend server with an identifier, i.e. your company name.
- Run the app using the desired platform:
- `yarn ios`
- `yarn android`
Expand Down
55 changes: 0 additions & 55 deletions android/app/_BUCK

This file was deleted.

Loading

0 comments on commit 5f93ae4

Please sign in to comment.