Resolve conflict

.clj-kondo/config.edn

@@ -1,5 +1,6 @@
 {:lint-as {status-im.utils.views/defview  clojure.core/defn
            status-im.utils.views/letsubs  clojure.core/let
+           reagent.core/with-let          clojkure.core/let
            status-im.utils.fx/defn        clj-kondo.lint-as/def-catch-all
            quo.react/with-deps-check      clojure.core/fn
            quo.previews.preview/list-comp clojure.core/for

.env.e2e

@@ -27,5 +27,5 @@ MAX_IMAGES_BATCH=5
 APN_TOPIC=im.status.ethereum.pr
 VERIFY_TRANSACTION_CHAIN_ID=3
 COMMUNITIES_ENABLED=1
-COMMUNITIES_MANAGEMENT_ENABLED=0
 DATABASE_MANAGEMENT_ENABLED=1
+COMMUNITIES_MANAGEMENT_ENABLED=1

.env.jenkins

@@ -27,5 +27,5 @@ BLANK_PREVIEW=0
 MAX_IMAGES_BATCH=5
 GOOGLE_FREE=0
 COMMUNITIES_ENABLED=1
-COMMUNITIES_MANAGEMENT_ENABLED=0
 DATABASE_MANAGEMENT_ENABLED=1
+COMMUNITIES_MANAGEMENT_ENABLED=1

.env.nightly

@@ -22,3 +22,4 @@ MAX_IMAGES_BATCH=5
 BLANK_PREVIEW=0
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
+COMMUNITIES_MANAGEMENT_ENABLED=1

RELEASES.md

@@ -1,3 +1,47 @@
+## 1.11
+### iOS
+#### Excerpt
+V1.11 also makes some improvements to the overall Status experience. Improved compatibility with DApps creates a more seamless experience with your favorite DeFi, NFT, and other decentralized applications. Improvements to Status Nodes and fixes to Android notifications have been made for better performance with private, group chats and public chats.
+
+Update in the App Store or Google Play if you do not have auto updates enabled.
+
+For the full changelog, see Github https://github.com/status-im/status-react/milestone/49?closed=1
+
+#### Added
+- Add Giphy url support in chat
+- The Graph (GRT) erc-20 token added to the default list
+
+#### Changed
+- Improved compatibility with DApps
+- Sync with Status Nodes improvements
+
+#### Fixed
+- Fixes to Android notifications
+- UI fixes
+- Sluggish performance on private group chats bug
+
+### Android
+#### Excerpt
+V1.11 also makes some improvements to the overall Status experience. Improved compatibility with DApps creates a more seamless experience with your favorite DeFi, NFT, and other decentralized applications. Improvements to Status Nodes and fixes to Android notifications have been made for better performance with private, group chats and public chats.
+
+Update in the App Store or Google Play if you do not have auto updates enabled.
+
+For the full changelog, see Github https://github.com/status-im/status-react/milestone/49?closed=1
+
+#### Added
+- Migrate existing account to Keycard 
+- Add Giphy url support in chat
+- The Graph (GRT) erc-20 token added to the default list
+
+#### Changed
+- Improved compatibility with DApps
+- Sync with Status Nodes improvements
+
+#### Fixed
+- Fixes to Android notifications
+- UI fixes
+- Sluggish performance on private group chats bug
+
 ## 1.10
 ### iOS
 #### Excerpt

ci/Jenkinsfile.combined

@@ -26,7 +26,7 @@ pipeline {
     booleanParam(
       name: 'PUBLISH',
       description: 'Trigger publishing of build results for nightly or release.',
-      defaultValue: params.PUBLISH ?: false,
+      defaultValue: getPublishDefault(params.PUBLISH),
     )
   }
 
@@ -120,3 +120,13 @@ def List genChoices(String previousChoice, List defaultChoices) {
   choices.add(0, previousChoice)
   return choices
 }
+
+/* Helper that makes PUBLISH default to 'false' unless:
+ * - The build is for a release branch
+ * - A user explicitly specified a value
+ * Since release builds create and re-create GitHub drafts every time. */
+def Boolean getPublishDefault(Boolean previousValue) {
+  if (env.JOB_NAME.startsWith('status-react/release')) { return true }
+  if (previousValue != null) { return previousValue }
+  return false
+}

doc/RELEASE_CHECKLIST.md

@@ -8,9 +8,14 @@
 - [ ] Privacy policy reviewed and updated
 - [ ] App translations for key features merged and tested
 - [ ] Countries to be excluded
+- [ ] Changes to our FAQ made
 
 #### Before publishing
 - [ ] Translations for comms available
 - [ ] Promotional content ready
 - [ ] Update Draft with release on https://github.com/status-im/status-react/releases
 - [ ] Add release to DO store and [update site](https://notes.status.im/s/status-release-upload#) (Jakub - requires credentials to upload) 
+
+#### At time of publishing
+- [ ] validate draft release on github release page https://github.com/status-im/status-react/releases
+- [ ] update https://github.com/status-im/status-react/blob/develop/RELEASES.md with release notes 

ios/Bridge.swift

@@ -0,0 +1,9 @@
+//
+//  Bridge.swift
+//  StatusIm
+//
+//  Created by Andrea Franz on 02/12/2020.
+//  Copyright © 2020 Status. All rights reserved.
+//
+
+import Foundation

ios/Podfile

@@ -19,21 +19,26 @@ abstract_target 'Status' do
   pod 'Permission-Microphone', :path => "#{permissions_path}/Microphone.podspec"
   pod 'Permission-Camera', :path => "#{permissions_path}/Camera.podspec"
 
+  pod "react-native-status-keycard", path: "../node_modules/react-native-status-keycard"
+  pod "Keycard", git: "https://github.com/status-im/Keycard.swift.git"
+  pod 'secp256k1', git: "https://github.com/status-im/secp256k1.swift.git", submodules: true
+
   target 'StatusIm' do
     target 'StatusImTests' do
       inherit! :complete
       # Pods for testing
     end
   end
-  
+
   target 'StatusImPR' do
   end
-  
+
   use_flipper!
   post_install do |installer|
     flipper_post_install(installer)
   end
 
 
   use_native_modules!
-end
+end
+

ios/Podfile.lock

@@ -2,8 +2,9 @@ PODS:
   - boost-for-react-native (1.63.0)
   - BVLinearGradient (2.5.6):
     - React
-  - CocoaAsyncSocket (7.6.4)
+  - CocoaAsyncSocket (7.6.5)
   - CocoaLibEvent (1.0.0)
+  - CryptoSwift (1.3.8)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.63.4)
   - FBReactNativeSpec (0.63.4):
@@ -69,6 +70,18 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
+  - Keycard (3.0.4):
+    - CryptoSwift
+    - secp256k1
+  - libwebp (1.1.0):
+    - libwebp/demux (= 1.1.0)
+    - libwebp/mux (= 1.1.0)
+    - libwebp/webp (= 1.1.0)
+  - libwebp/demux (1.1.0):
+    - libwebp/webp
+  - libwebp/mux (1.1.0):
+    - libwebp/demux
+  - libwebp/webp (1.1.0)
   - OpenSSL-Universal (1.0.2.20):
     - OpenSSL-Universal/Static (= 1.0.2.20)
   - OpenSSL-Universal/Static (1.0.2.20)
@@ -266,6 +279,9 @@ PODS:
     - React
   - react-native-splash-screen (3.2.0):
     - React
+  - react-native-status-keycard (2.5.30):
+    - Keycard
+    - React
   - react-native-webview (10.9.2):
     - React-Core
   - React-RCTActionSheet (0.63.4):
@@ -369,13 +385,20 @@ PODS:
     - React
   - RNSVG (9.13.6):
     - React
+  - SDWebImage (5.10.2):
+    - SDWebImage/Core (= 5.10.2)
+  - SDWebImage/Core (5.10.2)
+  - SDWebImageWebPCoder (0.6.1):
+    - libwebp (~> 1.0)
+    - SDWebImage/Core (~> 5.7)
+  - secp256k1 (0.1.6)
   - SQLCipher (3.4.2):
     - SQLCipher/standard (= 3.4.2)
   - SQLCipher/common (3.4.2)
   - SQLCipher/standard (3.4.2):
     - SQLCipher/common
   - SSZipArchive (2.2.3)
-  - TOCropViewController (2.5.5)
+  - TOCropViewController (2.6.0)
   - TouchID (4.4.1):
     - React
   - Yoga (1.14.0)
@@ -408,6 +431,7 @@ DEPENDENCIES:
   - FlipperKit/SKIOSNetworkPlugin (~> 0.54.0)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
+  - Keycard (from `https://github.com/status-im/Keycard.swift.git`)
   - Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera.podspec`)
   - Permission-Microphone (from `../node_modules/react-native-permissions/ios/Microphone.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -433,6 +457,7 @@ DEPENDENCIES:
   - react-native-shake (from `../node_modules/react-native-shake`)
   - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
   - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
+  - react-native-status-keycard (from `../node_modules/react-native-status-keycard`)
   - react-native-webview (from `../node_modules/react-native-webview`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
@@ -461,6 +486,7 @@ DEPENDENCIES:
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
   - RNSVG (from `../node_modules/react-native-svg`)
+  - secp256k1 (from `https://github.com/status-im/secp256k1.swift.git`)
   - SQLCipher (~> 3.0)
   - SSZipArchive
   - TouchID (from `../node_modules/react-native-touch-id`)
@@ -471,6 +497,7 @@ SPEC REPOS:
     - boost-for-react-native
     - CocoaAsyncSocket
     - CocoaLibEvent
+    - CryptoSwift
     - Flipper
     - Flipper-DoubleConversion
     - Flipper-Folly
@@ -497,6 +524,8 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
   glog:
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
+  Keycard:
+    :git: https://github.com/status-im/Keycard.swift.git
   Permission-Camera:
     :path: "../node_modules/react-native-permissions/ios/Camera.podspec"
   Permission-Microphone:
@@ -543,6 +572,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/slider"
   react-native-splash-screen:
     :path: "../node_modules/react-native-splash-screen"
+  react-native-status-keycard:
+    :path: "../node_modules/react-native-status-keycard"
   react-native-webview:
     :path: "../node_modules/react-native-webview"
   React-RCTActionSheet:
@@ -599,16 +630,29 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-screens"
   RNSVG:
     :path: "../node_modules/react-native-svg"
+  secp256k1:
+    :git: https://github.com/status-im/secp256k1.swift.git
+    :submodules: true
   TouchID:
     :path: "../node_modules/react-native-touch-id"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
+CHECKOUT OPTIONS:
+  Keycard:
+    :commit: 36e260cfafc2755a47f1e5f542858ceb0c6c37df
+    :git: https://github.com/status-im/Keycard.swift.git
+  secp256k1:
+    :commit: 46a1fa30d9b8babeae85ff519050f42394ab5fcc
+    :git: https://github.com/status-im/secp256k1.swift.git
+    :submodules: true
+
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
-  CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
+  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
+  CryptoSwift: 01b0f0cba1d5c212e5a335ff6c054fb75a204f00
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
   FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
@@ -621,6 +665,8 @@ SPEC CHECKSUMS:
   FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
   Folly: b73c3869541e86821df3c387eb0af5f65addfab4
   glog: cee4319f395bad5865ef3f32466c2e0ae677432c
+  Keycard: dd96182888da0aacf4de821b641103143bbb26cc
+  libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3
   OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd
   Permission-Camera: afad27bf90337684d4a86f3825112d648c8c4d3b
   Permission-Microphone: 0ffabc3fe1c75cfb260525ee3f529383c9f4368c
@@ -645,6 +691,7 @@ SPEC CHECKSUMS:
   react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
   react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
+  react-native-status-keycard: a001766cf8f27de56406ac712a52a982f1f28744
   react-native-webview: 4e96d493f9f90ba4f03b28933f30b2964df07e39
   React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
   React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
@@ -673,13 +720,16 @@ SPEC CHECKSUMS:
   RNReanimated: 89f5e0a04d1dd52fbf27e7e7030d8f80a646a3fc
   RNScreens: b748efec66e095134c7166ca333b628cd7e6f3e2
   RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f
+  SDWebImage: b969dcfc02c40a5da71eac0b03b8f1a0c794a86f
+  SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21
+  secp256k1: f61d67e6fdcb85fd727acf1bf35ace6036db540c
   SQLCipher: f9fcf29b2e59ced7defc2a2bdd0ebe79b40d4990
   SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9
-  TOCropViewController: da59f531f8ac8a94ef6d6c0fc34009350f9e8bfe
+  TOCropViewController: 3105367e808b7d3d886a74ff59bf4804e7d3ab38
   TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
   Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 8752b77562edc2969e7016627fa83c23a152cf3c
+PODFILE CHECKSUM: 5d4b89aa09f8d53bc530d173622952e85d5d7662
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1