fix emoji pin in community (#16041 )

disable chat swipe back navigation in ios (#16035 )
Add default customization color (#16026 )
2023-05-29 17:25:47 +05:30 · 2023-05-29 15:41:48 +05:30 · 2023-05-25 16:55:44 +05:30 · 2023-05-25 14:08:14 +05:30 · 2023-05-25 13:58:33 +05:30 · 2023-05-24 18:40:42 +05:30
290 changed files with 5780 additions and 4015 deletions
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.8'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -40,6 +40,9 @@ pipeline {
    BUILD_ENV = 'prod'
    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
    FASTLANE_DISABLE_COLORS = 1
+    /* coverage report identification */
+    COVERALLS_SERVICE_NAME = "jenkins"
+    COVERALLS_SERVICE_JOB_ID = "${JOB_NAME}#${BUILD_NUMBER}"
  }

  stages {
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.8'

 pipeline {
  agent { label 'linux' }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.8'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.8'

 pipeline {
  agent { label params.AGENT_LABEL }
@@ -61,9 +61,10 @@ pipeline {
    }
    stage('Build android jsbundle') {
      steps { script {
-        /* Build/fetch deps required for jsbundle build. */
+        /* build/fetch things required to produce a js-bundle for android
+         * (e.g. maven and node repos) */
        nix.build(
-          attr: 'targets.mobile.jsbundle',
+          attr: 'targets.mobile.android.jsbundle',
          sandbox: false,
          pure: false,
          link: false
@@ -72,7 +73,7 @@ pipeline {
    }
    stage('Build android deps') {
      steps { script {
-        /* Build/fetch deps required to build android release. */
+        /* build/fetch things required to build jsbundle and android */
        nix.build(
          attr: 'targets.mobile.android.release.buildInputs',
          sandbox: false,
@@ -83,7 +84,7 @@ pipeline {
    }
    stage('Build nix shell deps') {
      steps { script {
-        /* Build/fetch deps required to start default Nix shell. */
+        /* build/fetch things required to instantiate shell.nix for TARGET=all */
        nix.build(
          attr: 'shells.default.buildInputs',
          sandbox: false,
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.8'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.8'

 pipeline {

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.8'

 pipeline {

@@ -45,7 +45,6 @@ pipeline {

  options {
    disableConcurrentBuilds()
-    timeout(time: 90, unit: 'MINUTES')
  }

  stages {
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.8'

 pipeline {

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.8'

 pipeline {
  agent { label 'macos' }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.8'

 pipeline {
  agent { label 'linux' }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.9'
+library 'status-jenkins-lib@v1.7.8'

 pipeline {
  agent {
@@ -182,6 +182,17 @@ def build_ios_e2e
  )
 end

+def upload_to_diawi(source)
+  diawi(
+    file: source,
+    timeout: 120,
+    check_status_delay: 5,
+    token: ENV['DIAWI_TOKEN']
+  )
+  # save the URL to a file for use in CI
+  File.write('diawi.out', lane_context[SharedValues::UPLOADED_FILE_LINK_TO_DIAWI])
+end
+
 platform :ios do
  desc '`fastlane ios adhoc` - ad-hoc lane for iOS.'
  desc 'This lane is used for PRs, Releases, etc.'
@@ -245,6 +256,27 @@ platform :ios do
    )
  end

+  desc '`fastlane ios clean` - remove inactive TestFlight users'
+  lane :clean do
+    clean_testflight_testers(
+      username: ENV['FASTLANE_APPLE_ID'],
+      days_of_inactivity: 30
+    )
+    # In the future we can try using 'oldest_build_allowed'
+  end
+
+  desc '`fastlane ios upload-diawi` - upload .ipa to diawi'
+  desc 'expects to have an .ipa prepared: `status-ios/StatusIm.ipa`'
+  desc 'expects to have a diawi token as DIAWI_TOKEN env variable'
+  desc 'expects to have a github token as GITHUB_TOKEN env variable'
+  desc "will fails if file isn't there"
+  desc '---'
+  desc 'Output: writes `fastlane/diawi.out` file url of the uploded file'
+  lane :upload_diawi do
+    ipa = ENV['DIAWI_IPA'] || 'status-ios/StatusIm.ipa'
+    upload_to_diawi(ipa)
+  end
+
  desc '`fastlane ios saucelabs` - upload .app to sauce labs'
  desc 'also notifies in a GitHub comments'
  desc 'expects to have an .apk prepared: `result/app.apk`'
@@ -1,3 +1,7 @@
 source 'https://rubygems.org'

 gem 'fastlane', '>= 2.131.0'
+
+plugins_path = ENV['FASTLANE_PLUGINFILE_PATH'] ||
+               File.join(__dir__, 'Pluginfile')
+eval_gemfile(plugins_path) if plugins_path
@@ -3,21 +3,21 @@ GEM
  specs:
    CFPropertyList (3.0.6)
      rexml
-    addressable (2.8.4)
+    addressable (2.8.1)
      public_suffix (>= 2.0.2, < 6.0)
    artifactory (3.0.15)
    atomos (0.1.3)
    aws-eventstream (1.2.0)
-    aws-partitions (1.768.0)
-    aws-sdk-core (3.173.0)
+    aws-partitions (1.728.0)
+    aws-sdk-core (3.170.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.651.0)
      aws-sigv4 (~> 1.5)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.64.0)
+    aws-sdk-kms (1.63.0)
      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
+    aws-sdk-s3 (1.119.1)
      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
@@ -65,8 +65,8 @@ GEM
    faraday-retry (1.0.3)
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.212.2)
+    fastimage (2.2.6)
+    fastlane (2.212.1)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -105,8 +105,11 @@ GEM
      xcodeproj (>= 1.13.0, < 2.0.0)
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
+    fastlane-plugin-clean_testflight_testers (0.3.0)
+    fastlane-plugin-diawi (2.1.0)
+      rest-client (>= 2.0.0)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.42.0)
+    google-apis-androidpublisher_v3 (0.36.0)
      google-apis-core (>= 0.11.0, < 2.a)
    google-apis-core (0.11.0)
      addressable (~> 2.5, >= 2.5.1)
@@ -137,7 +140,7 @@ GEM
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.5.2)
+    googleauth (1.3.0)
      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
@@ -145,6 +148,7 @@ GEM
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
    highline (2.0.3)
+    http-accept (1.7.0)
    http-cookie (1.0.5)
      domain_name (~> 0.5)
    httpclient (2.8.3)
@@ -152,12 +156,16 @@ GEM
    json (2.6.3)
    jwt (2.7.0)
    memoist (0.16.2)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2023.0218.1)
    mini_magick (4.12.0)
    mini_mime (1.1.2)
    multi_json (1.15.0)
    multipart-post (2.0.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
+    netrc (0.11.0)
    optparse (0.1.1)
    os (1.1.4)
    plist (3.7.0)
@@ -167,6 +175,11 @@ GEM
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
    retriable (3.1.2)
    rexml (3.2.5)
    rouge (2.0.7)
@@ -213,6 +226,8 @@ PLATFORMS

 DEPENDENCIES
  fastlane (>= 2.131.0)
+  fastlane-plugin-clean_testflight_testers
+  fastlane-plugin-diawi

 BUNDLED WITH
-   2.3.9
+   2.4.6
@@ -0,0 +1,6 @@
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+gem 'fastlane-plugin-clean_testflight_testers'
+gem 'fastlane-plugin-diawi'
@@ -24,6 +24,8 @@ let

    shellHook = ''
      [ -z "$STATUS_MOBILE_HOME" ] && echo "STATUS_MOBILE_HOME is empty!" && exit 1
+
+      export FASTLANE_PLUGINFILE_PATH=$STATUS_MOBILE_HOME/fastlane/Pluginfile
    '';

    meta = with lib; {
@@ -5,10 +5,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
+      sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw";
      type = "gem";
    };
-    version = "2.8.4";
+    version = "2.8.1";
  };
  artifactory = {
    groups = ["default"];
@@ -45,10 +45,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1256rf6zjh3canwr636w7yczbvhh72cpz2fw5ixljbh4fcfkrvlm";
+      sha256 = "0q3q19insq5ablmr6ypq033qg1gsar5mdphhp7xg80rd615cnq97";
      type = "gem";
    };
-    version = "1.768.0";
+    version = "1.728.0";
  };
  aws-sdk-core = {
    dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -56,10 +56,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "10djgbz4k9w3axka8xrhf97h9yh9svi5g5xvncfwnkg6h22w2177";
+      sha256 = "0zc4zhv2wq7s5p8c9iaplama1lpg2kwldg81j83c8w4xydf1wd2r";
      type = "gem";
    };
-    version = "3.173.0";
+    version = "3.170.0";
  };
  aws-sdk-kms = {
    dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -67,10 +67,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0";
+      sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02";
      type = "gem";
    };
-    version = "1.64.0";
+    version = "1.63.0";
  };
  aws-sdk-s3 = {
    dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -78,10 +78,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "01cryf8kfkmlsxb327szcwcagsp7lss5gmk6zxlgap65lv8bc7rx";
+      sha256 = "1rpnlzsl52znhcki13jkwdshgwf51pn26267481f4fa842gr7xgp";
      type = "gem";
    };
-    version = "1.122.0";
+    version = "1.119.1";
  };
  aws-sigv4 = {
    dependencies = ["aws-eventstream"];
@@ -357,10 +357,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1pd7pamzhdz2w0fbcvsfn2nyslznvphnwj16zw35g2b28zd2xyzx";
+      sha256 = "0nnggg20za5vamdpkgrxxa32z33d8hf0g2bciswkhqnc6amb3yjr";
      type = "gem";
    };
-    version = "2.2.7";
+    version = "2.2.6";
  };
  fastlane = {
    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
@@ -368,10 +368,31 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "15sa3v3aaslympg9nmadmpxpbzykdiybzxn3navc7mf0iscb3q7s";
+      sha256 = "0b22m2dkydyv2si55b1jzznzgxf2ycx2aarv1j5p25k861h2gsml";
      type = "gem";
    };
-    version = "2.212.2";
+    version = "2.212.1";
+  };
+  fastlane-plugin-clean_testflight_testers = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qkcjf7xrnki4v94mcgcm3v2f89vq8clwxx1d5ipv0wwm5ri26c9";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  fastlane-plugin-diawi = {
+    dependencies = ["rest-client"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sjznx9hwlfa7ndv7av870dvl0cvmh68yk381r55ylw4jjvk5mwl";
+      type = "gem";
+    };
+    version = "2.1.0";
  };
  gh_inspector = {
    groups = ["default"];
@@ -389,10 +410,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0ks2ak4fcvlflhyinykvd88g2ybxwsbc347aww349zhn1mqprbvg";
+      sha256 = "1mbnmn36z1cnsd6ar76p9wvqi0ac6wlpm1p1lqczivain16qma76";
      type = "gem";
    };
-    version = "0.42.0";
+    version = "0.36.0";
  };
  google-apis-core = {
    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
@@ -487,10 +508,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis";
+      sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai";
      type = "gem";
    };
-    version = "1.5.2";
+    version = "1.3.0";
  };
  highline = {
    groups = ["default"];
@@ -502,6 +523,16 @@
    };
    version = "2.0.3";
  };
+  http-accept = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
  http-cookie = {
    dependencies = ["domain_name"];
    groups = ["default"];
@@ -563,6 +594,27 @@
    };
    version = "0.16.2";
  };
+  mime-types = {
+    dependencies = ["mime-types-data"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
+      type = "gem";
+    };
+    version = "3.4.1";
+  };
+  mime-types-data = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9";
+      type = "gem";
+    };
+    version = "3.2023.0218.1";
+  };
  mini_magick = {
    groups = ["default"];
    platforms = [];
@@ -623,6 +675,16 @@
    };
    version = "2.2.1";
  };
+  netrc = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
  optparse = {
    groups = ["default"];
    platforms = [];
@@ -684,6 +746,17 @@
    };
    version = "3.2.0";
  };
+  rest-client = {
+    dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
  retriable = {
    groups = ["default"];
    platforms = [];
@@ -67,8 +67,8 @@ public class PushNotificationHelper {
    private static final long DEFAULT_VIBRATION = 300L;
    private static final String CHANNEL_ID = "status-im-notifications";
    public static final String ACTION_DELETE_NOTIFICATION = "im.status.ethereum.module.DELETE_NOTIFICATION";
+    public static final String ACTION_TAP_NOTIFICATION = "im.status.ethereum.module.TAP_NOTIFICATION";
    public static final String ACTION_TAP_STOP = "im.status.ethereum.module.TAP_STOP";
-    final int flag =  Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE : PendingIntent.FLAG_CANCEL_CURRENT;

    private NotificationManager notificationManager;

@@ -119,8 +119,13 @@ public class PushNotificationHelper {
    private final BroadcastReceiver notificationActionReceiver = new BroadcastReceiver() {
            @Override
            public void onReceive(Context context, Intent intent) {
-                if (intent.getAction() == ACTION_DELETE_NOTIFICATION) {
+                if (intent.getAction() == ACTION_TAP_NOTIFICATION ||
+                    intent.getAction() == ACTION_DELETE_NOTIFICATION) {
+                    String deepLink = intent.getExtras().getString("im.status.ethereum.deepLink");
                    String groupId = intent.getExtras().getString("im.status.ethereum.groupId");
+                    if (intent.getAction() == ACTION_TAP_NOTIFICATION) {
+                        context.startActivity(getOpenAppIntent(deepLink));
+                    }
                    if (groupId != null) {
                        cleanGroup(groupId);
                    }
@@ -136,6 +141,7 @@ public class PushNotificationHelper {
    private void registerBroadcastReceiver() {
        IntentFilter filter = new IntentFilter();
        filter.addAction(ACTION_DELETE_NOTIFICATION);
+        filter.addAction(ACTION_TAP_NOTIFICATION);
        filter.addAction(ACTION_TAP_STOP);
        context.registerReceiver(notificationActionReceiver, filter);
        Log.e(LOG_TAG, "Broadcast Receiver registered");
@@ -695,31 +701,37 @@ public class PushNotificationHelper {

    private StatusMessage createMessage(Bundle data) {
        Person author = getPerson(data.getBundle("notificationAuthor"));
-        long timeStampLongValue = (long) data.getDouble("timestamp");
-        return new StatusMessage(data.getString("id"), author, timeStampLongValue, data.getString("message"));
+        return new StatusMessage(data.getString("id"), author,  data.getLong("timestamp"), data.getString("message"));
    }

    private PendingIntent createGroupOnDismissedIntent(Context context, int notificationId, String groupId, String deepLink) {
        Intent intent = new Intent(ACTION_DELETE_NOTIFICATION);
        intent.putExtra("im.status.ethereum.deepLink", deepLink);
        intent.putExtra("im.status.ethereum.groupId", groupId);
-        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent, flag);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
    }

    private PendingIntent createGroupOnTapIntent(Context context, int notificationId, String groupId, String deepLink) {
-        Intent intent = getOpenAppIntent(deepLink);
-        return PendingIntent.getActivity(context.getApplicationContext(), notificationId, intent, flag);
+        Intent intent = new Intent(ACTION_TAP_NOTIFICATION);
+        intent.putExtra("im.status.ethereum.deepLink", deepLink);
+        intent.putExtra("im.status.ethereum.groupId", groupId);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
   }

    private PendingIntent createOnTapIntent(Context context, int notificationId, String deepLink) {
-        Intent intent = getOpenAppIntent(deepLink);
-        return PendingIntent.getActivity(context.getApplicationContext(), notificationId, intent, flag);
+        Intent intent = new Intent(ACTION_TAP_NOTIFICATION);
+        intent.putExtra("im.status.ethereum.deepLink", deepLink);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
   }

    private PendingIntent createOnDismissedIntent(Context context, int notificationId, String deepLink) {
        Intent intent = new Intent(ACTION_DELETE_NOTIFICATION);
        intent.putExtra("im.status.ethereum.deepLink", deepLink);
-        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent, flag);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
    }

    public void removeStatusMessage(Bundle bundle) {
@@ -103,6 +103,45 @@
    }
  },

+  {
+    "path": "cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "ff154f318e1f63061b5bd42d9a38fc8547360cb4",
+      "sha256": "166ynlrph7rx3nql0c85c37vcbcsnwbjamk71hw74rz451pgnncr"
+    },
+    "jar": {
+      "sha1": "d5c53eca9f3884402c76268b82e3828223dcbf90",
+      "sha256": "1530hwqpxzxfjm6dy77whqwjzzx79jpnd9xvnkxy1lnk7l7lj494"
+    }
+  },
+
+  {
+    "path": "cljsjs/react-dom/17.0.1-0/react-dom-17.0.1-0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "077d1a0973c23cbbff52dea7365dca4cf9de5ad5",
+      "sha256": "1ccm3l19cgy30hr03n8jgkgzmswdbg520zmg97xk8b16ncn964jn"
+    },
+    "jar": {
+      "sha1": "a98b94cbc84d264ba9892c971cfaf5920c2152f1",
+      "sha256": "0ym20h0h7mw1mxzm1r7smbj65x8nsqj3cszg82mw3aw4a8j32c29"
+    }
+  },
+
+  {
+    "path": "cljsjs/react/17.0.1-0/react-17.0.1-0",
+    "host": "https://repo.clojars.org",
+    "pom": {
+      "sha1": "d5d3681281585d981375fe7bb29362bfcd0d4449",
+      "sha256": "0rskh6mfq5h0l0wybs68w9v585a6zlnnfgrvsf5k3h51fk2p28da"
+    },
+    "jar": {
+      "sha1": "726da8a9305a865df90d81e9a8d58f87ff0ee8bd",
+      "sha256": "0bfmvw8gk98vdf9azll6041r1jaz1pmb0dyb35cfc8dr3mmr4ag7"
+    }
+  },
+
  {
    "path": "clout/clout/2.1.2/clout-2.1.2",
    "host": "https://repo.clojars.org",
@@ -975,15 +1014,15 @@
  },

  {
-    "path": "org/clojure/tools.logging/1.1.0/tools.logging-1.1.0",
+    "path": "org/clojure/tools.logging/0.4.1/tools.logging-0.4.1",
    "host": "https://repo1.maven.org/maven2",
    "pom": {
-      "sha1": "44b6bd9ac74cb5e2254e1f0b258d53c1829b865d",
-      "sha256": "093jy29w5gm9rp9va6qlhb6096jpf5higyk7sgmbwb5nf53qi3qb"
+      "sha1": "483bbfc82aee3c005bb1ad36dec77ba5d6c5f95c",
+      "sha256": "1qhfigr9am90fx527ax6f7z7xahgsd5hzb4pmi40n79nx3jsc9hf"
    },
    "jar": {
-      "sha1": "84cb5d00caa9df2ee504d46f6107f4708271f619",
-      "sha256": "0x2zzivn38z179lxkw9wbi9n9qwsf466lrd9y27khdz7wbxhscb5"
+      "sha1": "991bebc6e3633b85091ae929d62c116a2584aee7",
+      "sha256": "001sx1ddgx0ys0z1qphzpxjf2w35rikrfjc0h5bvvqbw8ra0vvja"
    }
  },

@@ -1313,15 +1352,15 @@
  },

  {
-    "path": "re-frame/re-frame/1.3.0/re-frame-1.3.0",
+    "path": "re-frame/re-frame/0.12.0/re-frame-0.12.0",
    "host": "https://repo.clojars.org",
    "pom": {
-      "sha1": "b1f70463fba018c5464d3fc0843232fe955c1372",
-      "sha256": "0yqq1kg1si0akr7kx7w1l4vvkdai20na6h6627ibqkgwzivkc5n5"
+      "sha1": "41fd34c15c1cf68eec81435e09d0a79fd8a88276",
+      "sha256": "08c3sxi3sdkay3550vb3gbv5czzdh2kyin4mb8cpd2wd5g2c88sq"
    },
    "jar": {
-      "sha1": "b7135a76432b8141027ba1f4eb6bb15a36acfb7c",
-      "sha256": "16wi01z0j4wn04kldwzxvj0pd9dianjyb000nv5611ikhxk1qrps"
+      "sha1": "3ff92169fe7588ad62dad2d6ea3bf0e5d3e2d224",
+      "sha256": "1m5sjskgjx028s1zpa631bp52y9hjn8l1nr8hrwiwdh09i2kpnk2"
    }
  },

@@ -1352,15 +1391,15 @@
  },

  {
-    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
+    "path": "reagent/reagent/1.0.0/reagent-1.0.0",
    "host": "https://repo.clojars.org",
    "pom": {
-      "sha1": "d2279922777793edfc0ae9e01d68a832eb5ce52d",
-      "sha256": "1h1gk4cykidm1jx75dq426lrgf8r7900fcir5jz59zp1ka2a0ywb"
+      "sha1": "93ad5ccb0101108fb0843a3f2c50da28f8fd8336",
+      "sha256": "1l4xzgc4wbd8b29mhj5j336cf8w1zccaia0w413zf3bnj6jf5m38"
    },
    "jar": {
-      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
-      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
+      "sha1": "a1dd4d40425bb2e1afad0fe72780b43ff394ccfa",
+      "sha256": "1g607s1ymns85923bvhwrsj0y5czyqqq1jmxx0a58fnsm1b318fa"
    }
  },

@@ -6,6 +6,9 @@ camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar
 cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3.jar
 cider/piggieback/0.4.1/piggieback-0.4.1.jar
 cljs-bean/cljs-bean/1.3.0/cljs-bean-1.3.0.jar
+cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0.jar
+cljsjs/react-dom/17.0.1-0/react-dom-17.0.1-0.jar
+cljsjs/react/17.0.1-0/react-17.0.1-0.jar
 clout/clout/2.1.2/clout-2.1.2.jar
 com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2.jar
 com/bhauman/cljs-test-display/0.1.1/cljs-test-display-0.1.1.jar
@@ -73,7 +76,7 @@ org/clojure/test.check/1.1.0/test.check-1.1.0.jar
 org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0.jar
 org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0.jar
 org/clojure/tools.cli/1.0.194/tools.cli-1.0.194.jar
-org/clojure/tools.logging/1.1.0/tools.logging-1.1.0.jar
+org/clojure/tools.logging/0.4.1/tools.logging-0.4.1.jar
 org/clojure/tools.macro/0.1.5/tools.macro-0.1.5.jar
 org/clojure/tools.reader/1.3.3/tools.reader-1.3.3.jar
 org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar
@@ -99,10 +102,10 @@ org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final.jar
 prismatic/schema/1.1.7/schema-1.1.7.jar
 quoin/quoin/0.1.2/quoin-0.1.2.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
-re-frame/re-frame/1.3.0/re-frame-1.3.0.jar
+re-frame/re-frame/0.12.0/re-frame-0.12.0.jar
 re-frisk-remote/re-frisk-remote/1.6.0/re-frisk-remote-1.6.0.jar
 re-frisk/sente/1.15.0/sente-1.15.0.jar
-reagent/reagent/1.2.0/reagent-1.2.0.jar
+reagent/reagent/1.0.0/reagent-1.0.0.jar
 refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar
 ring-cors/ring-cors/0.1.8/ring-cors-0.1.8.jar
 ring/ring-codec/1.1.2/ring-codec-1.1.2.jar
@@ -1,119 +0,0 @@
-#!/usr/bin/env node
-
-import https from 'node:https'
-import { basename } from 'node:path'
-import { promisify } from 'node:util'
-import { createReadStream } from 'node:fs'
-
-import log from 'npmlog'
-import FormData from 'form-data'
-
-const UPLOAD_URL = 'https://upload.diawi.com/'
-const STATUS_URL = 'https://upload.diawi.com/status'
-const POLL_MAX_COUNT = 10
-const POLL_INTERVAL_MS = 700
-
-const sleep = (ms) => {
-  return new Promise((resolve, reject) => {
-    setTimeout(resolve, (ms))
-  })
-}
-
-const getRequest = async (url) => {
-  return new Promise((resolve, reject) => {
-    let data = []
-    https.get(url, res => {
-      res.on('error', err => reject(err))
-      res.on('data', chunk => { data.push(chunk) })
-      res.on('end', () => {
-        let payload = Buffer.concat(data).toString()
-        resolve({
-          code: res.statusCode,
-          message: res.statusMessage,
-          payload: payload,
-        })
-      })
-    })
-  })
-}
-
-const uploadIpa = async (ipaPath, comment, token) => {
-  let form = new FormData()
-  form.append('token', token)
-  form.append('file', createReadStream(ipaPath))
-  form.append('comment', comment || basename(ipaPath))
-
-  const formSubmitPromise = promisify(form.submit.bind(form))
-
-  const res = await formSubmitPromise(UPLOAD_URL)
-  if (res.statusCode != 200) {
-    log.error('uploadIpa', 'Upload failed: %d %s', res.statusCode, res.statusMessage)
-    process.exit(1)
-  }
-
-  return new Promise((resolve) => {
-    const jobId = res.on('data', async (data) => {
-      resolve(JSON.parse(data)['job'])
-    })
-  })
-}
-
-const checkStatus = async (jobId, token) => {
-  let params = new URLSearchParams({
-    token: token, job: jobId,
-  })
-  let rval = await getRequest(`${STATUS_URL}?${params.toString()}`)
-  if (rval.code != 200) {
-    log.error('checkStatus', 'Check query failed: %d %s', rval.code, rval.message)
-    process.exit(1)
-  }
-  return JSON.parse(rval.payload)
-}
-
-const pollStatus = async (jobId, token) => {
-  let interval = POLL_INTERVAL_MS
-  for (let i = 0; i <= POLL_MAX_COUNT; i++) {
-    let json = await checkStatus(jobId, token)
-    switch (json.status) {
-      case 2000:
-        return json
-      case 2001:
-        log.verbose('pollStatus', 'Waiting: %s', json.message)
-        break /* Nothing, just poll again. */
-      case 4000000:
-        log.warning('pollStatus', 'Doubling polling interval: %s', json.message)
-        interval *= 2
-        break
-      default:
-        log.error('pollStatus', `Error in status response: ${json.message}`)
-        process.exit(1)
-    }
-    await sleep(interval)
-  }
-}
-
-const main = async () => {
-  const token = process.env.DIAWI_TOKEN
-  const targetFile = process.argv[2]
-  const comment = process.argv[3]
-  log.level = process.env.VERBOSE ? 'verbose' : 'info'
-
-  if (token === undefined) {
-    log.error('main', 'No DIAWI_TOKEN env var provided!')
-    process.exit(1)
-  }
-  if (targetFile === undefined) {
-    log.error('main', 'No file path provided!')
-    process.exit(1)
-  }
-
-  log.info('main', 'Uploading: %s', targetFile)
-  let jobId = await uploadIpa(targetFile, comment, token)
-
-  log.info('main', 'Polling upload job status: %s', jobId)
-  let uploadMeta = await pollStatus(jobId, token)
-
-  console.log(uploadMeta)
-}
-
-main()
@@ -1,8 +1,8 @@
 ;; shadow-cljs configuration
 {:source-paths ["src" "test/cljs"]

- :dependencies [[reagent "1.2.0"]
-                [re-frame "1.3.0"]
+ :dependencies [[reagent "1.0.0"]
+                [re-frame "0.12.0"]
                [binaryage/oops "0.7.0"]
                [com.andrewmcveigh/cljs-time "0.5.2"]
                [status-im/timbre "4.10.0-2-status"]
@@ -220,10 +220,10 @@
   only icon
   [button {:icon true} :i/close-circle]"
  [_ _]
-  (let [pressed-in (reagent/atom false)]
+  (let [pressed (reagent/atom false)]
    (fn
-      [{:keys [on-press disabled type size before after above icon-secondary-no-color
-               width customization-color override-theme override-background-color pressed
+      [{:keys [on-press disabled type size before after above
+               width customization-color override-theme override-background-color
               on-long-press accessibility-label icon icon-no-color style inner-style test-ID]
        :or   {type                :primary
               size                40
@@ -234,17 +234,17 @@
                    [(or
                      override-theme
                      (theme/get-theme)) type])
-            state (cond disabled                 :disabled
-                        (or @pressed-in pressed) :pressed
-                        :else                    :default)
+            state (cond disabled :disabled
+                        @pressed :pressed
+                        :else    :default)
            icon-size (when (= 24 size) 12)
            icon-secondary-color (or icon-secondary-color icon-color)]
        [rn/touchable-without-feedback
         (merge {:test-ID             test-ID
                 :disabled            disabled
                 :accessibility-label accessibility-label
-                 :on-press-in         #(reset! pressed-in true)
-                 :on-press-out        #(reset! pressed-in nil)}
+                 :on-press-in         #(reset! pressed true)
+                 :on-press-out        #(reset! pressed nil)}
                (when on-press
                  {:on-press on-press})
                (when on-long-press
@@ -306,6 +306,5 @@
              [quo2.icons/icon after
               {:container-style {:margin-left  4
                                  :margin-right (if (= size 40) 12 8)}
-                :no-color        icon-secondary-no-color
                :color           icon-secondary-color
                :size            icon-size}]])]]]))))
@@ -68,8 +68,7 @@
        :on-press-out        #(reset! pressed? false)
        :on-press            on-press
        :active-opacity      1
-        :hit-slop            {:top 5 :bottom 5 :left 5 :right 5}
-        :pointer-events      :auto
+        :style               {:padding 5}
        :accessibility-label type}
       [rn/view
        {:style (merge
@@ -42,8 +42,7 @@
    (case type
      :words
      [rn/flat-list
-       {:keyboard-should-persist-taps      :always
-        :data                              words
+       {:data                              words
        :content-container-style           style/word-list
        :render-fn                         word-component
        :render-data                       {:blur?    blur?
@@ -90,8 +90,7 @@
   (merge {:underlay-color (colors/theme-colors
                            colors/neutral-5
                            colors/neutral-95)
-           :style          {:border-radius 12
-                            :margin-left   12}}
+           :style          {:border-radius 12}}
          props)
   [rn/view (merge (style/membership-info-container) style)
    [community-icon/community-icon
@@ -26,8 +26,9 @@
   value]
  (let [type       (or type :default)
        text-color (or override-text-color
-                       (if (or (= (theme/get-theme) :dark)
-                               (= type :default))
+                       (if (or
+                            (= (theme/get-theme) :dark)
+                            (= type :default))
                         colors/white
                         colors/neutral-100))
        value      (utils.number/parse-int value)
@@ -51,20 +52,16 @@
                                    style)
                             (= type :outline)
                             (merge {:border-width 1
-                                     :border-color (colors/get-color :yin-yang (theme/get-theme))})
+                                     :border-color (get-color type)})

                             (not= type :outline)
                             (assoc :background-color
                                    (or override-bg-color
-                                        (colors/get-color :yin-yang (theme/get-theme))))
+                                        (get-color type)))

                             (> value max-value)
                             (assoc :padding-left 0.5))}
     [text/text
      {:weight :medium
       :size   :label
-       :style  {:color (colors/get-secondary-color
-                        :yin-yang
-                        (theme/get-theme)
-                        colors/white)}}
-      label]]))
+       :style  {:color text-color}} label]]))
@@ -1,62 +1,53 @@
 (ns quo2.components.drawers.action-drawers.component-spec
-  (:require [quo2.components.drawers.action-drawers.view :as action-drawer]
-            [test-helpers.component :as h]))
+  (:require ["@testing-library/react-native" :as rtl]
+            [quo2.components.drawers.action-drawers.view :as action-drawer]
+            [reagent.core :as reagent]))

-(h/describe "action drawer"
-  (h/test "default render"
-    (h/render [action-drawer/action-drawer
-               [[{:icon  :i/friend
-                  :label "a sample label"}]]])
-    (h/is-truthy (h/get-by-text "a sample label")))
+(defn render-action-drawer
+  ([options]
+   (rtl/render (reagent/as-element [action-drawer/action-drawer options]))))

-  (h/test "renders with elements sub-label displaying"
-    (h/render [action-drawer/action-drawer
-               [[{:icon      :i/friend
-                  :label     "a sample label"
-                  :sub-label "a sample sub label"}]]])
-    (h/is-truthy (h/get-by-text "a sample sub label")))
+(js/global.test "action-drawer renders with elements label displaying"
+  (fn []
+    (render-action-drawer [[{:icon  :i/friend
+                             :label "a sample label"}]])
+    (-> (js/expect (rtl/screen.getByText "a sample label"))
+        (.toBeTruthy))))

-  (h/test "on click action works on element"
-    (let [on-press (js/jest.fn)]
-      (h/render [action-drawer/action-drawer
-                 [[{:icon     :i/friend
-                    :label    "a sample label"
-                    :on-press on-press}]]])
-      (h/fire-event :press (h/get-by-text "a sample label"))
-      (h/was-called on-press)))
+(js/global.test "action-drawer renders with elements sub-label displaying"
+  (fn []
+    (render-action-drawer [[{:icon      :i/friend
+                             :label     "a sample label"
+                             :sub-label "a sample sub label"}]])
+    (-> (js/expect (rtl/screen.getByText "a sample sub label"))
+        (.toBeTruthy))))

-  (h/test "disabled state"
-    (let [on-press-muted  (js/jest.fn)
-          on-press-friend (js/jest.fn)
-          label-mute      "Mute"
-          label-friend    "View member details"]
-      (h/render [action-drawer/action-drawer
-                 [[{:icon     :i/muted
-                    :label    label-mute
-                    :on-press on-press-muted}
-                   {:icon      :i/friend
-                    :label     label-friend
-                    :disabled? true
-                    :on-press  on-press-friend}]]])
-      (h/fire-event :press (h/get-by-text label-mute))
-      (h/was-called on-press-muted)
+(js/global.test "action-drawer on click action works on element"
+  (let [event (js/jest.fn)]
+    (fn []
+      (render-action-drawer [[{:icon     :i/friend
+                               :label    "a sample label"
+                               :on-press event}]])
+      (rtl/fireEvent.press (rtl/screen.getByText "a sample label"))
+      (-> (js/expect event)
+          (.toHaveBeenCalled)))))

-      (h/fire-event :press (h/get-by-text label-friend))
-      (h/was-not-called on-press-friend)))
+(js/global.test "action-drawer renders two icons when set"
+  (fn []
+    (render-action-drawer [[{:icon                :i/friend
+                             :label               "a sample label"
+                             :right-icon          :i/friend
+                             :accessibility-label :first-element}]])
+    (-> (js/expect (rtl/screen.getByLabelText "right-icon-for-action"))
+        (.toBeTruthy))
+    (-> (js/expect (rtl/screen.queryByLabelText "left-icon-for-action"))
+        (.toBeTruthy))))

-  (h/test "renders two icons when set"
-    (h/render [action-drawer/action-drawer
-               [[{:icon                :i/friend
-                  :label               "a sample label"
-                  :right-icon          :i/friend
-                  :accessibility-label :first-element}]]])
-    (h/is-truthy (h/get-by-label-text "right-icon-for-action"))
-    (h/is-truthy (h/query-by-label-text "left-icon-for-action")))
-
-  (h/test "renders a divider when the add-divider? prop is true"
-    (h/render [action-drawer/action-drawer
-               [[{:icon                :i/friend
-                  :label               "a sample label"
-                  :add-divider?        true
-                  :accessibility-label :first-element}]]])
-    (h/is-truthy (h/get-all-by-label-text "divider"))))
+(js/global.test "action-drawer renders a divider when the add-divider? prop is true"
+  (fn []
+    (render-action-drawer [[{:icon                :i/friend
+                             :label               "a sample label"
+                             :add-divider?        true
+                             :accessibility-label :first-element}]])
+    (-> (js/expect (rtl/screen.getAllByLabelText "divider"))
+        (.toBeTruthy))))
@@ -11,10 +11,9 @@
   :flex-direction   :row})

 (defn container
-  [sub-label disabled?]
+  [sub-label]
  {:border-radius     12
   :height            (if sub-label 58 50)
-   :opacity           (when disabled? 0.3)
   :margin-horizontal 8})

 (defn row-container
@@ -18,19 +18,12 @@
    :accessible          true
    :accessibility-label :divider}])

-(defn- maybe-pressable
-  [disabled? props child]
-  (if disabled?
-    [rn/view (dissoc props :on-press) child]
-    [rn/touchable-highlight props child]))
-
-(defn- action
+(defn action
  [{:keys [icon
           label
           sub-label
           right-icon
           danger?
-           disabled?
           on-press
           add-divider?
           override-theme
@@ -40,9 +33,9 @@
    [:<> {:key label}
     (when add-divider?
       [divider])
-     [maybe-pressable disabled?
+     [rn/touchable-highlight
      {:accessibility-label accessibility-label
-       :style               (style/container sub-label disabled?)
+       :style               (style/container sub-label)
       :underlay-color      (colors/theme-colors colors/neutral-5 colors/neutral-90 override-theme)
       :on-press            on-press}
      [rn/view
@@ -1,9 +1,10 @@
 (ns quo2.components.drawers.documentation-drawers.style)

 (def container
-  {:align-items        :flex-start
-   :padding-horizontal 20})
+  {:align-items :flex-start
+   :padding     20})

 (def content
-  {:margin-top    8
+  {:margin-top    12
   :margin-bottom 16})
+
@@ -1,11 +1,10 @@
 (ns quo2.components.drawers.drawer-buttons.style
-  (:require [quo2.foundations.colors :as colors]))
+  (:require [quo2.foundations.colors :as colors]
+            [react-native.platform :as platform]))

 (def outer-container
-  {:height                  216
-   :border-top-left-radius  20
-   :border-top-right-radius 20
-   :overflow                :hidden})
+  {:height        216
+   :border-radius 20})

 (def top-card
  {:flex                    1
@@ -13,7 +12,9 @@
   :padding-horizontal      20
   :border-top-left-radius  20
   :border-top-right-radius 20
-   :background-color        colors/neutral-80-opa-80-blur})
+   :background-color        (if platform/ios?
+                              colors/neutral-80-opa-80-blur
+                              colors/neutral-80)})

 (def bottom-card
  {:position                :absolute
@@ -32,11 +33,11 @@
   :justify-content :space-between})

 (def bottom-icon
-  {:border-radius   32
+  {:border-radius   40
   :border-width    1
   :margin-left     24
-   :height          32
-   :width           32
+   :height          28
+   :width           28
   :justify-content :center
   :align-items     :center
   :border-color    colors/white-opa-5})
@@ -51,4 +52,4 @@
 (defn heading-text
  [gap]
  {:color         colors/white
-   :margin-bottom gap})
+   :margin-bottom gap})
@@ -71,28 +71,14 @@
    child-2           string, keyword or hiccup
   "
  [{:keys [container-style top-card bottom-card]} child-1 child-2]
-  [rn/view
+  [blur/ios-view
   {:style (merge container-style style/outer-container)}
-   [blur/view
-    {:blur-type   :dark
-     :blur-amount 10
-     :style       {:flex                    1
-                   :border-top-left-radius  20
-                   :border-top-right-radius 20}}]
-   [rn/view
-    {:style {:flex             1
-             :background-color :transparent
-             :position         :absolute
-             :top              0
-             :left             0
-             :right            0
-             :bottom           0}}
-    [card
-     (merge {:gap   4
-             :top?  true
-             :style style/top-card}
-            top-card) child-1]
-    [card
-     (merge {:style style/bottom-card
-             :gap   20}
-            bottom-card) child-2]]])
+   [card
+    (merge {:gap   4
+            :top?  true
+            :style style/top-card}
+           top-card) child-1]
+   [card
+    (merge {:style style/bottom-card
+            :gap   20}
+           bottom-card) child-2]])
@@ -1,14 +1,165 @@
 (ns quo2.components.dropdowns.dropdown
-  (:require [quo2.components.buttons.button :as button]))
+  (:require [quo2.components.icon :as icons]
+            [quo2.components.markdown.text :as text]
+            [quo2.foundations.colors :as colors]
+            [react-native.core :as rn]
+            [react-native.reanimated :as reanimated]
+            [reagent.core :as reagent]))
+
+(defn apply-anim
+  [dd-height val]
+  (reanimated/animate-shared-value-with-delay dd-height
+                                              val
+                                              300
+                                              :easing1
+                                              0))
+
+(def sizes
+  {:big    {:icon-size 20
+            :font      {:font-size :paragraph-1}
+            :height    40
+            :padding   {:padding-with-icon    {:padding-vertical   9
+                                               :padding-horizontal 12}
+                        :padding-with-no-icon {:padding-vertical 9
+                                               :padding-left     12
+                                               :padding-right    8}}}
+   :medium {:icon-size 20
+            :font      {:font-size :paragraph-1}
+            :height    32
+            :padding   {:padding-with-icon    {:padding-vertical   5
+                                               :padding-horizontal 8}
+                        :padding-with-no-icon {:padding-vertical 5
+                                               :padding-left     12
+                                               :padding-right    8}}}
+   :small  {:icon-size 15
+            :font      {:font-size :paragraph-2}
+            :height    24
+            :padding   {:padding-with-icon    {:padding-vertical   3
+                                               :padding-horizontal 6}
+                        :padding-with-no-icon {:padding-vertical   3
+                                               :padding-horizontal 6}}}})
+(defn color-by-10
+  [color]
+  (colors/alpha color 0.6))
+
+(defn dropdown-comp
+  [{:keys [icon dd-height size disabled? dd-color use-border? border-color]}]
+  (let [dark?                                                         (colors/dark?)
+        {:keys [width height width-with-icon padding font icon-size]} (size sizes)
+        {:keys [padding-with-icon padding-with-no-icon]}              padding
+        font-size                                                     (:font-size font)
+        spacing                                                       (case size
+                                                                        :big    4
+                                                                        :medium 2
+                                                                        :small  2)
+        open?                                                         (reagent/atom false)]
+    (fn []
+      [rn/touchable-opacity
+       (cond->
+         {:on-press (fn []
+                      (if (swap! open? not)
+                        (apply-anim dd-height 120)
+                        (apply-anim dd-height 0)))
+          :style    (cond->
+                      (merge
+                       (if icon
+                         padding-with-icon
+                         padding-with-no-icon)
+                       {:width            (if icon
+                                            width-with-icon
+                                            width)
+                        :height           height
+                        :border-radius    (case size
+                                            :big    12
+                                            :medium 10
+                                            :small  8)
+                        :flex-direction   :row
+                        :align-items      :center
+                        :background-color (if @open?
+                                            dd-color
+                                            (color-by-10 dd-color))})
+                      use-border? (assoc :border-width 1
+                                         :border-color (if @open?
+                                                         border-color
+                                                         (color-by-10 border-color))))}
+         disabled? (assoc-in [:style :opacity] 0.3)
+         disabled? (assoc :disabled true))
+       (when icon
+         [icons/icon icon
+          {:no-color        true
+           :size            20
+           :container-style {:margin-right spacing
+                             :margin-top   1
+                             :width        icon-size
+                             :height       icon-size}}])
+       [text/text
+        {:size   font-size
+         :weight :medium
+         :font   :font-medium
+         :color  :main} "Dropdown"]
+       [icons/icon
+        (if @open?
+          (if dark?
+            :main-icons/pullup-dark
+            :main-icons/pullup)
+          (if dark?
+            :main-icons/dropdown-dark
+            :main-icons/dropdown))
+        {:size            20
+         :no-color        true
+         :container-style {:width         (+ icon-size 3)
+                           :border-radius 20
+                           :margin-left   (if (= :small size)
+                                            2
+                                            4)
+                           :margin-top    1
+                           :height        (+ icon-size 4)}}]])))
+
+(defn items-comp
+  [{:keys [items on-select]}]
+  (let [items-count (count items)]
+    [rn/scroll-view
+     {:horizontal          false
+      :nestedScrollEnabled true}
+     (doall
+      (map-indexed (fn [index item]
+                     [rn/touchable-opacity
+                      {:key      (str item index)
+                       :style    {:padding             4
+                                  :border-bottom-width (if (= index (- items-count 1))
+                                                         0
+                                                         1)
+                                  :border-color        (colors/theme-colors
+                                                        colors/neutral-100
+                                                        colors/white)
+                                  :text-align          :center}
+                       :on-press #(on-select item)}
+                      [text/text {:style {:text-align :center}} item]])
+                   items))]))
+
+(defn- f-dropdown
+  [{:keys [items icon text default-item on-select size disabled? border-color use-border? dd-color]}]
+  (let [dd-height (reanimated/use-shared-value 0)]
+    [rn/view {:style {:flex-grow 1}}
+     [dropdown-comp
+      {:items        items
+       :icon         icon
+       :disabled?    disabled?
+       :size         size
+       :dd-color     dd-color
+       :text         text
+       :border-color (colors/custom-color-by-theme border-color 50 60)
+       :use-border?  use-border?
+       :default-item default-item
+       :dd-height    dd-height}]
+     [reanimated/view
+      {:style (reanimated/apply-animations-to-style
+               {:height dd-height}
+               {})}
+      [items-comp
+       {:items     items
+        :on-select on-select}]]]))

 (defn dropdown
-  [_ _]
-  (fn [{:keys [on-change selected] :as opts} children]
-    [button/button
-     (merge
-      opts
-      {:after                   (if selected :i/pullup :i/dropdown)
-       :icon-secondary-no-color true
-       :pressed                 selected
-       :on-press                #(when on-change (on-change selected))})
-     children]))
+  [params]
+  [:f> f-dropdown params])
@@ -1,30 +0,0 @@
-(ns quo2.components.empty-state.empty-state.styles
-  (:require [quo2.foundations.colors :as colors]))
-
-(def container
-  {:padding     12
-   :align-items :center})
-
-(def image
-  {:width  80
-   :height 80})
-
-(def text-container
-  {:margin-top  12
-   :align-items :center})
-
-(defn title
-  [blur?]
-  (cond-> {:margin-bottom 2}
-    blur? (assoc :color colors/white)))
-
-(defn description
-  [blur?]
-  (when blur?
-    {:color colors/white}))
-
-(def button-container {:margin-top 20})
-
-(defn upper-button-color
-  [customization-color]
-  (colors/custom-color-by-theme customization-color 50 60))
@@ -1,50 +0,0 @@
-(ns quo2.components.empty-state.empty-state.view
-  (:require [quo2.components.buttons.button :as button]
-            [quo2.components.empty-state.empty-state.styles :as styles]
-            [quo2.components.markdown.text :as text]
-            [react-native.core :as rn]
-            [react-native.fast-image :as fast-image]))
-
-(defn empty-state
-  [{:keys        [customization-color image title description blur?]
-    upper-button :upper-button
-    lower-button :lower-button
-    :or          {customization-color :blue}}]
-  [rn/view {:style styles/container}
-   [fast-image/fast-image
-    {:style  styles/image
-     :source image}]
-   [rn/view {:style styles/text-container}
-    [text/text
-     {:style           (styles/title blur?)
-      :number-of-lines 1
-      :weight          :semi-bold
-      :size            :paragraph-1}
-     title]
-    [text/text
-     {:style           (styles/description blur?)
-      :number-of-lines 1
-      :text-align      :center
-      :weight          :regular
-      :size            :paragraph-2}
-     description]]
-   (when-let [{upper-button-text     :text
-               upper-button-on-press :on-press} upper-button]
-     [rn/view {:style styles/button-container}
-      [button/button
-       (cond-> {:type                      :primary
-                :size                      32
-                :override-background-color (styles/upper-button-color customization-color)
-                :on-press                  upper-button-on-press}
-         blur? (assoc :override-theme :dark))
-       upper-button-text]
-
-      (when-let [{lower-button-text     :text
-                  lower-button-on-press :on-press} lower-button]
-        [button/button
-         (cond-> {:style    {:margin-top 12}
-                  :size     32
-                  :type     :blur-bg
-                  :on-press lower-button-on-press}
-           blur? (assoc :override-theme :dark))
-         lower-button-text])])])
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Parvesh Monu	b669db5c45	fix emoji pin in community (#16041 )	2023-05-29 17:25:47 +05:30
Parvesh Monu	92c39f4e69	disable chat swipe back navigation in ios (#16035 )	2023-05-29 15:41:48 +05:30
Mohamed Javid	c960d6e264	Add default customization color (#16026 ) Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2023-05-25 16:55:44 +05:30
Parvesh Monu	7db514ba4a	fix pin image in community leads to error (#16017 )	2023-05-25 14:08:14 +05:30
Volodymyr Kozieiev	a94e0a8c98	Bottom sheet background on Android changed to overcome issues with blur (#16009 )	2023-05-25 13:58:33 +05:30
Ajay Sivan	d3394197a2	new icons (#15937 )	2023-05-24 18:40:42 +05:30
Ajay Sivan	8ec7e07662	Bump release to 1.23.0	2023-05-24 00:09:45 +05:30