Merge branch 'develop' into us-1935

- Fix merge conflicts

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.7.3)
+    activesupport (6.1.7.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -63,10 +63,10 @@ GEM
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.2)
-    minitest (5.18.0)
+    minitest (5.19.0)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -85,7 +85,7 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   ruby

android/app/build.gradle

@@ -257,7 +257,7 @@ dependencies {
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
-    implementation 'com.github.RampNetwork:ramp-sdk-android:1.+'
+    // implementation 'com.github.RampNetwork:ramp-sdk-android:1.+'
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
       exclude group:'com.facebook.fbjni'

config.json

@@ -1,18 +1,19 @@
 {
   "QR_READER_BITCOIN_DEFAULT_NETWORK_MAINNET": "BITCOIN",
   "QR_READER_BITCOIN_DEFAULT_NETWORK_TESTNET": "BITCOIN_TESTNET",
-  "RIF_RELAY_SERVER_MAINNET":"https://relay.rif-wallet-services.mainnet.rifcomputing.net",
-  "RIF_RELAY_SERVER_TESTNET":"https://relay.rif-wallet-services.testnet.rifcomputing.net",
-  "SMART_WALLET_FACTORY_ADDRESS_MAINNET":"0x9eebec6c5157bee13b451b1dfe1ee2cb40846323",
-  "SMART_WALLET_FACTORY_ADDRESS_TESTNET":"0xBaDb31cAf5B95edd785446B76219b60fB1f07233",
-  "RELAY_VERIFIER_ADDRESS_MAINNET":"0x5C9c7d96E6C59E55dA4dCf7F791AE58dAF8DBc86",
-  "RELAY_VERIFIER_ADDRESS_TESTNET":"0x5897E84216220663F306676458Afc7bf2A6A3C52",
-  "DEPLOY_VERIFIER_ADDRESS_MAINET":"0x2fd633e358bc50ccf6bf926d621e8612b55264c9",
-  "DEPLOY_VERIFIER_ADDRESS_TESTNET":"0xAe59e767768c6c25d64619Ee1c498Fd7D83e3c24",
-  "BTC_EXPLORER_ADDRESS_URL_MAINNET":"https://explorer.btc.com/btc/transaction",
-  "BTC_EXPLORER_ADDRESS_URL_TESTNET":"https://live.blockcypher.com/btc-testnet",
-  "RPC_URL_MAINNET":"https://public-node.rsk.co",
-  "RPC_URL_TESTNET":"https://public-node.testnet.rsk.co",
-  "EXPLORER_ADDRESS_URL_MAINNET":"https://explorer.rsk.co",
-  "EXPLORER_ADDRESS_URL_TESTNET":"https://explorer.testnet.rsk.co"
-}
+  "RIF_RELAY_SERVER_MAINNET": "https://relay.rif-wallet-services.mainnet.rifcomputing.net",
+  "RIF_RELAY_SERVER_TESTNET": "https://v2.relay.rif-wallet-services.testnet.rifcomputing.net",
+  "SMART_WALLET_FACTORY_ADDRESS_MAINNET": "0x9eebec6c5157bee13b451b1dfe1ee2cb40846323",
+  "SMART_WALLET_FACTORY_ADDRESS_TESTNET": "0xBaDb31cAf5B95edd785446B76219b60fB1f07233",
+  "RELAY_VERIFIER_ADDRESS_MAINNET": "0x5C9c7d96E6C59E55dA4dCf7F791AE58dAF8DBc86",
+  "RELAY_VERIFIER_ADDRESS_TESTNET": "0x5897E84216220663F306676458Afc7bf2A6A3C52",
+  "DEPLOY_VERIFIER_ADDRESS_MAINNET": "0x2fd633e358bc50ccf6bf926d621e8612b55264c9",
+  "DEPLOY_VERIFIER_ADDRESS_TESTNET": "0xAe59e767768c6c25d64619Ee1c498Fd7D83e3c24",
+  "BTC_EXPLORER_ADDRESS_URL_MAINNET": "https://explorer.btc.com/btc/transaction",
+  "BTC_EXPLORER_ADDRESS_URL_TESTNET": "https://live.blockcypher.com/btc-testnet",
+  "RPC_URL_MAINNET": "https://public-node.rsk.co",
+  "RPC_URL_TESTNET": "https://public-node.testnet.rsk.co",
+  "EXPLORER_ADDRESS_URL_MAINNET": "https://explorer.rsk.co",
+  "EXPLORER_ADDRESS_URL_TESTNET": "https://explorer.testnet.rsk.co",
+  "TERMS_AND_CONDITIONS_URL": "https://drive.google.com/file/d/1-jKY7K_93g9c7kNJ__cDYkGYp03PrOO8/view"
+}

ios/Podfile

@@ -6,7 +6,7 @@ platform :ios, '12.4'
 inhibit_all_warnings!
 
 # Dependecies required for Ramp.network:
-source 'https://github.com/CocoaPods/Specs.git'
+# source 'https://github.com/CocoaPods/Specs.git'
 
 target 'rifWallet' do
   config = use_native_modules!
@@ -32,7 +32,7 @@ target 'rifWallet' do
 
   pod 'react-native-config', :path => '../node_modules/react-native-config'
   pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
-  pod 'Ramp', :git => 'https://github.com/RampNetwork/ramp-sdk-ios', :tag => '4.0.1'
+  # pod 'Ramp', :git => 'https://github.com/RampNetwork/ramp-sdk-ios', :tag => '4.0.1'
 
   target 'rifWalletTests' do
     inherit! :complete

ios/Podfile.lock

@@ -139,10 +139,6 @@ PODS:
   - OpenSSL-Universal (1.1.1100)
   - PromisesObjC (2.1.1)
   - Protobuf (3.21.12)
-  - Ramp (4.0.1)
-  - ramp-network-react-native-sdk (1.0.1):
-    - Ramp
-    - React-Core
   - RCT-Folly (2021.07.22.00):
     - boost
     - DoubleConversion
@@ -554,8 +550,6 @@ DEPENDENCIES:
   - jail-monkey (from `../node_modules/jail-monkey`)
   - libevent (~> 2.1.12)
   - OpenSSL-Universal (= 1.1.1100)
-  - Ramp (from `https://github.com/RampNetwork/ramp-sdk-ios`, tag `4.0.1`)
-  - "ramp-network-react-native-sdk (from `../node_modules/@ramp-network/react-native-sdk`)"
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
@@ -659,11 +653,6 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/sdks/hermes/hermes-engine.podspec"
   jail-monkey:
     :path: "../node_modules/jail-monkey"
-  Ramp:
-    :git: https://github.com/RampNetwork/ramp-sdk-ios
-    :tag: 4.0.1
-  ramp-network-react-native-sdk:
-    :path: "../node_modules/@ramp-network/react-native-sdk"
   RCT-Folly:
     :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
@@ -763,11 +752,6 @@ EXTERNAL SOURCES:
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
-CHECKOUT OPTIONS:
-  Ramp:
-    :git: https://github.com/RampNetwork/ramp-sdk-ios
-    :tag: 4.0.1
-
 SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
@@ -805,8 +789,6 @@ SPEC CHECKSUMS:
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
   PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
   Protobuf: 120350fc38646e2dedc26f49ecba778184ea1de2
-  Ramp: 3f843fb75cac12ad40842afa3226bae36dc93521
-  ramp-network-react-native-sdk: dabb00cff767616c6c50c1964eea3c0fcad7bee9
   RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
   RCTRequired: e1866f61af7049eb3d8e08e8b133abd38bc1ca7a
   RCTTypeSafety: 27c2ac1b00609a432ced1ae701247593f07f901e