Merge branch 'develop' into fix/reject-on-drag

.prettierignore

@@ -1,15 +1,10 @@
-/*
-
-# Format top-level js files.
+*
 !*.js
-
-# Ignore all except src/js/**/*.js
-!/src/
-/src/*
-!/src/js
-!/src/js/**/*.js
-
-# Ignore all except translations/en.json
-!/translations/
-/translations/*
-!/translations/en.json
+!*/
+*.clj-kondo
+*.shadow-cljs
+modules
+result
+target
+component-spec
+/app

.prettierrc.js

@@ -6,8 +6,4 @@ module.exports = {
   tabWidth: 2,
   trailingComma: 'all',
   useTabs: false,
-
-  // JSON sorting
-  jsonSortOrder: '{ "/.*/": "caseInsensitiveLexical" } ',
-  plugins: ['prettier-plugin-sort-json'],
 };

Makefile

@@ -317,7 +317,7 @@ lint: ##@test Run code style checks
 	scripts/lint/translations.clj && \
 	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
 	sh scripts/lint/trailing-newline.sh && \
-	node_modules/.bin/prettier --check .
+	node_modules/.bin/prettier --write .
 
 # NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
 lint-fix: export TARGET := clojure
@@ -353,17 +353,13 @@ test: export SHADOW_NS_REGEXP := .*-test$$
 test: ##@test Run all Clojure tests
 test: _test-clojure
 
-# Note: we need to override the :output-to and :ns-regexp options because
-# shadow-cljs has a bug where it will not read from the env vars to expand the
-# configuration when the shadow-cljs mobile target is already running.
 test-watch-for-repl: export TARGET := default
 test-watch-for-repl: export SHADOW_OUTPUT_TO := target/test/test.js
 test-watch-for-repl: export SHADOW_NS_REGEXP := .*-test$$
 test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connections
-	rm -f "$$SHADOW_OUTPUT_TO" && \
 	yarn install && shadow-cljs compile mocks && \
 	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \
-		"yarn shadow-cljs watch test --verbose --config-merge '{:output-to \"$(SHADOW_OUTPUT_TO)\" :ns-regexp \"$(SHADOW_NS_REGEXP)\"}'" \
+		'yarn shadow-cljs watch test --verbose' \
 		"until [ -f $$SHADOW_OUTPUT_TO ] ; do sleep 1 ; done ; node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO --repl"
 
 test-unit: export SHADOW_OUTPUT_TO := target/unit_test/test.js

doc/README.md

@@ -1,43 +1,67 @@
-## Getting Started
+## Getting Started 
+
+[Starting Guide](starting-guide.md)
+
+[IDE Setup](ide-setup.md)
+
 
-- [Starting Guide](starting-guide.md)
-- [IDE Setup](ide-setup.md)
 
 ## Development Process
 
-- [Coding guidelines](new-guidelines.md)
-- [UI components coding guidelines](ui-guidelines.md)
-- [Release Checklist](release-checklist.md)
-- [Release Guide](release-guide.md)
-- [Merging PR process](merging-pr-process.md)
-- [PR Review Policy](pr-review-policy.md)
-- [Working on PR together with QA team](pipeline_process.md)
-- [Debugging](debugging.md)
-- [Patching](patching.md)
-- [Creating a pixel perfect UI](pixel-perfection.md)
-- [Contributing to status-go](status-go-changes.md)
-- [Malli schemas (recorded demo)](https://www.youtube.com/watch?v=SlRio70aYVI) ([slides](files/forging-code-with-schemas-sep-2023-slides.pdf))
+[Coding guidelines](new-guidelines.md)
+
+[UI components coding guidelines](ui-guidelines.md)
+
+[Release Checklist](release-checklist.md)
+
+[Release Guide](release-guide.md)
+
+[Merging PR process](merging-pr-process.md)
+
+[PR Review Policy](pr-review-policy.md)
+
+[Working on PR together with QA team](pipeline_process.md)
+
+[Debugging](debugging.md)
+
+[Patching](patching.md)
+
+[Creating a pixel perfect UI](pixel-perfection.md)
+
+[Contributing to status-go](status-go-changes.md)
+
+[Malli schemas (recorded demo)](https://www.youtube.com/watch?v=SlRio70aYVI) ([slides](files/forging-code-with-schemas-sep-2023-slides.pdf))
 
 ## Testing
 
-- [Overview](tests/tests-overview.md)
-- [How to run local tests](tests/how-to-run-local-tests.md)
-- [End-to-end tests (e2e) overview](tests/how-to-launch-e2e.md)
-- [Component tests (jest) overview](tests/component-tests-overview.md)
+[How to run local tests](testing.md)
+
+[End-to-end tests (e2e) overview](how-to-launch-e2e.md)
+
+[Component tests (jest) overview](component-tests-overview.md)
+
 
 ## Project details
 
-- [status-go introduction (recorded meeting)](https://drive.google.com/file/d/1B7TljmTZ8fHkqJH8ChU1Cp4FGDFM03gq/view)
-- [re-frame usage (recorded meeting)](https://drive.google.com/file/d/1qv_E0CEGzQpu_zGXD0gCTU5EvhC2k8Jy/view)
-- [status app functionality demo](https://drive.google.com/file/u/0/d/1PmwsMLTLDNNIdv5_6wvMOwoj2PfT50c6/view)
+[status-go introduction (recorded meeting)](https://drive.google.com/file/d/1B7TljmTZ8fHkqJH8ChU1Cp4FGDFM03gq/view)
+
+[re-frame usage (recorded meeting)](https://drive.google.com/file/d/1qv_E0CEGzQpu_zGXD0gCTU5EvhC2k8Jy/view)
+
+[status app functionality demo](https://drive.google.com/file/u/0/d/1PmwsMLTLDNNIdv5_6wvMOwoj2PfT50c6/view)
 
 ## Misc
 
-- [Importing icons from Figma into project](export-icons.md)
-- [Updating Status APK builds for the F-Droid Android application catalogue](fdroid.md)
-- [Troubleshooting for known errors](troubleshooting.md)
+[Importing icons from Figma into project](export-icons.md)
+
+[Updating Status APK builds for the F-Droid Android application catalogue](fdroid.md)
+
+[Troubleshooting for known errors](troubleshooting.md)
+
+
 
 ## Outdated:
 
-- [Old guidelines](codebase-structure-and-guidelines.md)
-- [Post mortem analysis](post-mortem.md)
+[Old guidelines](codebase-structure-and-guidelines.md)
+
+[Post mortem analysis](post-mortem.md)
+

doc/how-to-launch-e2e.md

@@ -8,7 +8,7 @@ As a part of CI for Status mobile app and in order to ensure there are no regres
 - Automated tests written on Python 3.9 and pytest.
 - Appium (server) and Selenium WebDriver (protocol) are the base of test automation framework.
 
-TestRail is a test case management system tool where we have test cases.
+TestRail is a test case management system tool where we have test cases. 
 
 
 Each of the test case gets a priority (Critical/High/Medium)
@@ -20,21 +20,21 @@ For now we support e2e for Android only.
 Whenever we need to push set of test scripts we create 16 parallel sessions (max, but depending on amount of cases that are included in job) and each thread: 1) uploads Android .apk file to SauceLabs -> 2) runs through the test steps -> 3) receives results whether test failed on particular step or succeeded with no errors -> 3) Parse test results and push them as a Github comment (if the suite ran against respective PR) and into TestRail.
 
 We push **whole automation test suite (currently 155, amount is changing)** against each nightly build (if the nightly builds job succeeded). Results of the test run are saved in TestRail.
-And also we push set of autotests whenever PR with successful builds got moved in to `E2E Tests` column from [Pipeline for QA dashboard ](https://github.com/status-im/status-react/projects/7).
+And also we push set of autotests whenever PR with successful builds got moved in to `E2E Tests` column from [Pipeline for QA dashboard ](https://github.com/status-im/status-react/projects/7). 
 In that case we save results in TestRail as well and push a comment with test results in a respective PR.
 
 For example: https://github.com/status-im/status-react/pull/9147#issuecomment-540008770
 
-![](../images/how-to-launch-e2e/how-to-launch-e2e-1.png)
+![](images/how-to-launch-e2e/how-to-launch-e2e-1.png)
 
 
 The test_send_stt_from_wallet opens link in TestRail https://ethstatus.testrail.net/index.php?/tests/view/890885 where performed steps could be found
-List of all runs performed by test jobs could be found here https://ethstatus.testrail.net/index.php?/runs/overview/14
+List of all runs performed by test jobs could be found here https://ethstatus.testrail.net/index.php?/runs/overview/14 
 
 **For credentials for TestRail to see results ping Chu in DM**:
 
 Opening any test run navigates you to list of test cases with results:
-![](../images/how-to-launch-e2e/how-to-launch-e2e-2.png)
+![](images/how-to-launch-e2e/how-to-launch-e2e-2.png)
 
 
 ## What about launching e2e manually
@@ -53,12 +53,12 @@ Params to specify:
 - test_marks: tests by priorities (by default: `critical or high or medium`, which corresponds the whole suite; to launch the same suite as in PRs, use `critical or high`)
 - testrail_case_id: here is the list of test cases which you may find in test rail (4-digit value)
 
-For easier access you can hit `Rerun tests` in GH comment and testrail_case_id/ apk_name/ pr_id  will be filled automatically. For making sure that tests are being rerun on most recent e2e build it is recommended to paste link to the last e2e build in apk_name field. The list of PR builds can be found in Jenkins Builds block on PR page.
-![](../images/how-to-launch-e2e/how-to-launch-e2e-3.png)
+For easier access you can hit `Rerun tests` in GH comment and testrail_case_id/ apk_name/ pr_id  will be filled automatically. For making sure that tests are being rerun on most recent e2e build it is recommended to paste link to the last e2e build in apk_name field. The list of PR builds can be found in Jenkins Builds block on PR page. 
+![](images/how-to-launch-e2e/how-to-launch-e2e-3.png) 
 And then hit ‘Build’.
 Once the job starts it picks up specified tests, runs them against provided apk and sends results to pull request.
 
-Even we have 16 parallel sessions for testing it’s a time consuming operation (whole test suite we have automated at the moment takes ~140 minutes to finish).
+Even we have 16 parallel sessions for testing it’s a time consuming operation (whole test suite we have automated at the moment takes ~140 minutes to finish). 
 So for PRs we pick only set of `critical or high` (you can also use this in TEST_MARKS param for job)
 tests (otherwise some PRs could wait their turn of the scheduled Jenkins job till the next day).
 
@@ -78,9 +78,9 @@ Several examples of when test fails to succeed:
 
 - **Valid issue in the automated test scripts** - that's what we're looking for
 
-Example: here is the test results https://github.com/status-im/status-react/pull/13015#issuecomment-1016495043 where one test failed.
+Example: here is the test results https://github.com/status-im/status-react/pull/13015#issuecomment-1016495043 where one test failed. 
     1. Open the test in TestRail and open session recorded for this test in SauceLabs
-![](../images/how-to-launch-e2e/how-to-launch-e2e-4.png)
+![](images/how-to-launch-e2e/how-to-launch-e2e-4.png)
 
 
 In TestRail you may find all the steps performed by the test.
@@ -98,6 +98,6 @@ Not all features of the app could be covered by e2e at the moment:
 ## Brief flow for test to be automated
 
 Whenever there is a need to have a new test:
-1) Create a test scenario in TestRail.
+1) Create a test scenario in TestRail. 
 2) If certain item could be checked in scope of existing test case we update existing one (otherwise we may have thousands of test cases which is overkill to manage in TestRail as well as in automated test scripts). And also complex autotests increase probability to not catch regressions by stopping test execution (due to valid bug or changed feature) keeping the rest test steps uncovered. So here we need to balance when it makes sense to update existing test case with more checks.
 3) Then we create test script based on the test case, ensure test passes for the build and pushing the changes to repo.

doc/pipeline_process.md

@@ -32,9 +32,9 @@ Ready for testing, a PR should meet the following criteria:
 ### E2E tests and analyzing the results
 
 The PR **MUST** be moved to the E2E column when it is ready for testing (**mandatory for all PRs**).
-That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test.
+That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test. 
 This step cannot be skipped. So, at least one comment from the `status-im-auto` bot with results is a prerequisite for moving forward.
-Information on how to analyze tests can be found [here](https://github.com/status-im/status-mobile/blob/develop/doc/tests/how-to-launch-e2e.md).
+Information on how to analyze tests can be found [here](https://github.com/status-im/status-mobile/blob/develop/doc/how-to-launch-e2e.md).
 Tests might be flaky, as they depend on infrastructure - SauceLabs and Waku.
 
 If there are `Failed tests` and you are not sure about the reason, you can always ping the mobile QAs for help (preferably in PRs by `@status-im/mobile-qa`).
@@ -46,14 +46,14 @@ Please, respect this rule.**
 
 ### Adding `skip-manual-qa`
 
-**Do not hesitate to use a `skip-manual-qa`** if you're sure that it is a simple flow and you checked it.
+**Do not hesitate to use a `skip-manual-qa`** if you're sure that it is a simple flow and you checked it. 
 - Please ask another team member before adding the `skip-manual-qa` label (PR/Status community/DMs) so that there's a second opinion.
 - The PR MUST have a proper reasoning why manual QA is skipped.
 - The PR MUST include the steps of testing that has been done by the developer prior to moving it forward.
 
 **NOTE:** Make sure that QAs are OK with that;
 
-Before merging PRs, please make sure that information is added about how you tested the PRs, that e2s have been passed and their results have been reviewed.
+Before merging PRs, please make sure that information is added about how you tested the PRs, that e2s have been passed and their results have been reviewed. 
 
 The QA team appreciates your help!
 
@@ -72,7 +72,7 @@ The QA team appreciates your help!
 - QA engineer picks up one of PRs with the ```request-manual-qa``` label, drags the item to the ```IN TESTING``` column and assigns it to themselves.
 - During testing, QA will add comments describing the issues found, and also review automation tests results.
 Usually found issues are numbered as "Issue 1, Issue 2", etc.
-When the first round of testing is completed and all issues for this stage are found, the QA can add the ```Tested - Issues``` label and drag the card to the ```CONTRIBUTOR``` column. These two actions are optional.
+When the first round of testing is completed and all issues for this stage are found, the QA can add the ```Tested - Issues``` label and drag the card to the ```CONTRIBUTOR``` column. These two actions are optional. 
 
 **IMPORTANT NOTE:** when the issues are fixed, developer **MUST** notify the QA that it is ready to be re-tested again by mention them in the PR.
 
@@ -86,7 +86,7 @@ After that the developer merges PR into develop.
 _**How do I know if a design review is needed?**_
 
 There are three cases here depending on the changes in the PR:
-1. **Functional PRs with UI changes:** after the ```Tested - OK``` label is added, the QA moves the PR to the ```Design review``` column + mentions ```@Francesca-G``` in comments.
+1. **Functional PRs with UI changes:** after the ```Tested - OK``` label is added, the QA moves the PR to the ```Design review``` column + mentions ```@Francesca-G``` in comments. 
 2. **Component PRs:** once the PR has received a review from developers and e2e tests results, it can be moved directly to the ```Design review``` column by the developer (manual testing step can be skipped) + the developer mentions ```@Francesca-G``` in comments.
 3. **Functional PRs changes in which are not related to UI (e.g. a crash fix):** skip the ```Design review``` step (the PR should only be manually tested by QA).
 
@@ -99,7 +99,7 @@ There are three possible scenarios when the design review is completed:
 **Notes:**
 - If your PR has a long story and started from `develop` branch several days ago, please rebase it to current develop before adding label
 - if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality (see `skip-manual-qa` label)
----
+---        
 
 #### Why my PR is in `Contributor` column?
 PR can be moved to this column by the ```status-github-bot``` or by QA engineer with label `Tested-issues` or if one of the requirements for manual QA was not met.
@@ -120,6 +120,6 @@ In the second case - after fixing of all found issues, the developer should ping
 6. In case of manual testing - the label ```Tested - OK``` from QA
 7. In case of design review - the approval from the designer
 
-You can merge your PR into develop - some useful clues you can find [here](https://notes.status.im/setup-e2e#3-Merging-PR)
+You can merge your PR into develop - some useful clues you can find [here](https://notes.status.im/setup-e2e#3-Merging-PR) 
 
-HAPPY DEVELOPMENT! :tada:
+HAPPY DEVELOPMENT! :tada: 

doc/tests/tests-overview.md

@@ -1,167 +0,0 @@
-# Tests
-
-## Introduction
-
-This document provides a general overview of the types of tests we use and when
-to use them. It is not meant to be a tutorial or a detailed documentation about
-testing in software development.
-
-## Types of tests
-
-Tests in `status-mobile` are comprised of:
-
-- Unit tests
-  - Subscription tests
-  - Event tests
-  - Tests for various utilities
-- [Component tests](./component-tests-overview.md)
-- Integration/contract tests
-- [End-to-end tests](./how-to-launch-e2e.md)
-
-We apply the [test
-pyramid](https://en.wikipedia.org/wiki/Test_automation#Testing_at_different_levels)
-strategy, which means we want the majority of tests at the bottom of the
-pyramid. Those should be fast and deterministic and support REPL-Driven
-development (RDD). Slightly above them, we have component tests, then
-integration/contract tests and finally end-to-end tests. The closer to the top
-of the pyramid, the more valuable a test can be, but also more difficult to
-pinpoint why it failed and harder to make it dependable.
-
-*Note*: there are literally dozens of [types of
-tests](https://en.wikipedia.org/wiki/Software_testing), each with its strengths
-and weaknesses.
-
-We tend not to stub or mock implementations in our tests, which means our tests
-are [sociable](https://martinfowler.com/bliki/UnitTest.html).
-
-## What to test?
-
-The UI is driven by global & local state changes caused by events. Global state
-is managed by re-frame and local state by Reagent atoms or React hooks. Except
-for component and end-to-end tests, we test only non-UI code in `status-mobile`.
-Given that the UI is greatly derived from global state, by guaranteeing the
-state is correct we can prevent bugs and, more importantly, reduce the [cost of
-change](https://www.pmi.org/disciplined-agile/agile/costofchange).
-
-We strive to minimize the amount of _business logic_ in views (UI code). We
-achieve this by moving capabilities to status-go and also by adhering to
-re-frame's architecture.
-
-Whenever appropriate (see section `When to test?`), we _may_ test:
-
-- Re-frame events.
-- Re-frame subscriptions.
-- Utility functions.
-- User journeys through integration/contract tests.
-
-Interestingly, we don't test re-frame _effects_ in isolation.
-
-### What are status-mobile integration and contract tests?
-
-The mobile _integration tests_ can be used to "simulate" user interactions and
-make actual calls to status-go via the RPC layer and actually receive signals.
-We can also use these tests to verify the app-db and multiple subscriptions are
-correct. We use the word _simulate_ because there is no UI. Basically, any flow
-that can be driven by re-frame events is possible to automatically test. There
-is no way to change or inspect local state managed by React.
-
-A _contract test_ has the same capabilities as an integration test, but we want
-to draw the line that they should focus more on a particupar RPC endpoint or
-signal, and not on a user journey (e.g. create a wallet account). In the future,
-we may consider running them automatically in status-go.
-
-**Note:** integration tests and contract tests are currently overlapping in
-their responsibilities and still require a clearer distinction.
-
-## When to test?
-
-(Automated) tests basically exist to support rapid software changes, but not
-every piece of code should be tested. The following are general recommendations,
-not rules.
-
-- What would be the consequences to the user of a bug in the implementation you
-  are working on?
-- Can a QA exercise all the branches in the code you changed? Not surprisingly,
-  usually QAs can't test many code paths (it may be nearly impossible), and
-  because PRs are not often tested by reviewers, many PRs can get into `develop`
-  without the necessary quality assurance.
-- How costly was it for you to verify a function/event/etc was correct? Now
-  consider that this cost will be dispersed to every developer who needs to
-  change the implementation if there are no tests.
-- Check the number of conditionals, and if they nest as well. Every conditional
-  may require two different assertions, and the number of assertions can grow
-  exponentially.
-- How complicated are the arguments to the function? If they contain nested maps
-  or data that went through a few transformations, it may be tricky to decipher
-  what they are, unless you are familiar with the code. A test would be able to
-  capture the data, however complex they are.
-
-### When to unit-test subscriptions?
-
-Only test [layer-3
-subscriptions](https://day8.github.io/re-frame/subscriptions/#the-four-layers),
-i.e. don't bother testing extractor subscriptions (check the related
-[guideline](https://github.com/status-im/status-mobile/blob/7774c4eac16fdee950a17bf5d07630c45a980f41/doc/new-guidelines.md#subscription-tests)).
-Some layer-3 subscriptions can still be straightforward and may not be worth
-testing.
-
-- Check the number of _inputs_ to the sub (from the graph). The higher this
-  number, the greater the chance the subscription can break if any of the
-  input's implementation changes.
-
-**Note**: if a tested subscription changes inadvertently, even if its own tests
-still pass, other subscriptions that depend on it and have tests may still fail.
-This is why we don't directly test the subscription handler, but instead, use
-the macro `test-helpers.unit/deftest-sub`.
-
-### When to unit-test events?
-
-A good hint is to ask if you and other CCs need to rely on re-frisk, UI, REPL,
-or FlowStorm to understand the event. If the answer is yes or probably, then a
-test would be prudent.
-
-- Many events only receive arguments and pass them along without much or any
-  transformation to an RPC call. These are straightforward and usually don't
-  need tests ([example](https://github.com/status-im/status-mobile/blob/7774c4eac16fdee950a17bf5d07630c45a980f41/src/status_im/contexts/contact/blocking/events.cljs#L79-L85)).
-- Overall, every event basically returns two effects at most, `:fx` and/or
-  `:db`. Usually, the complicated part lies in the computation to return the new
-  app-db. If the event doesn't perform transformations in the app-db or just
-  does a trivial `assoc`, for example, it may not be worth testing.
-
-For reference, the re-frame author particularly [suggests testing events and
-subscriptions](https://github.com/day8/re-frame/blob/09e2d7132c479aa43f2a64164e54e42bf8511902/docs/Testing.md#what-to-test).
-
-### When to unit-test utility functions?
-
-Most utility functions in `status-mobile` are pure and can be readily and
-cheaply tested.
-
-- If the utility is used in an event/subscription and if the event/subscription
-  has tests, you may prefer to test the event/subscription and not the utility,
-  or the other way around sometimes.
-- If the utility is tricky to verify, such as functions manipulating time, write
-  tests ([example](https://github.com/status-im/status-mobile/blob/7774c4eac16fdee950a17bf5d07630c45a980f41/src/utils/datetime.cljs#L1)).
-- Utilities can be particularly hard to verify by QAs because they can be lower
-  level and require very particular inputs. In such cases, consider writing
-  tests.
-
-### When to write integration/contract tests?
-
-- You want to make real calls to status-go because you think the unit tests are
-  not enough (test pyramid strategy).
-- You constantly need to retest the same things on the UI, sometimes over
-  multiple screens.
-- The flow is too important to rely only on manual QA, which can't always be
-  done due to resource limits, so an integration/contract test fills this gap.
-- You want to rely less on end-to-end tests, which can be more unreliable and
-  slower to change.
-- You want automatic verifications for some area of the mobile app whenever
-  status-go is upgraded.
-
-**Note**: the feedback cycle to write integration tests is longer than unit
-tests because they are slower and harder to debug. Using the REPL with them is
-difficult due to their stateful nature.
-
-### When to test Quo components?
-
-This is covered in [quo/README.md#component-tests](https://github.com/status-im/status-mobile/blob/7774c4eac16fdee950a17bf5d07630c45a980f41/src/quo/README.md#component-tests).

package.json

@@ -97,8 +97,7 @@
     "jest-silent-reporter": "^0.5.0",
     "nodemon": "^2.0.16",
     "nyc": "^14.1.1",
-    "prettier": "^3.3.3",
-    "prettier-plugin-sort-json": "^4.0.0",
+    "prettier": "^2.8.8",
     "process": "0.11.10",
     "react-test-renderer": "18.1.0",
     "shadow-cljs": "2.26.2",

src/quo/components/avatars/token_avatar/view.cljs

@@ -1,6 +1,5 @@
 (ns quo.components.avatars.token-avatar.view
   (:require [quo.components.avatars.token-avatar.style :as style]
-            [quo.components.utilities.token.view :as token]
             [react-native.core :as rn]
             [react-native.hole-view :as hole-view]
             [react-native.platform :as platform]
@@ -13,14 +12,13 @@
      [:map {:closed true}
       [:type {:optional true} [:enum :asset :collectible]]
       [:context? {:optional true} [:maybe :boolean]]
-      [:image {:optional true} [:maybe :schema.common/image-source]]
-      [:token {:optional true} [:maybe [:or :keyword :string]]]
+      [:image :schema.common/image-source]
       [:network-image {:optional true} [:maybe :schema.common/image-source]]
       [:container-style {:optional true} [:maybe :map]]]]]
    :any])
 
 (defn- view-internal
-  [{:keys [type context? image token network-image container-style]}]
+  [{:keys [type context? image network-image container-style]}]
   [rn/view
    {:style               (merge style/container container-style)
     :accessibility-label :token-avatar}
@@ -34,11 +32,9 @@
                       [])
              :style style/hole-view}
       platform/android? (assoc :key context?))
-    [token/view
-     {:size         :size-32
-      :token        token
-      :style        (style/image type)
-      :image-source image}]]
+    [rn/image
+     {:source image
+      :style  (style/image type)}]]
    (when context?
      [rn/image
       {:source network-image

src/quo/components/drawers/bottom_actions/style.cljs

@@ -21,17 +21,12 @@
                        (colors/theme-colors colors/white colors/neutral-95 theme))})
 
 (defn buttons-container
-  [actions container-style]
-  (merge
-   {:flex-direction     (if (= actions :two-vertical-actions) :column :row)
-    :justify-content    :space-around
-    :padding-vertical   12
-    :gap                12
-    :padding-horizontal 20}
-   container-style))
-
-(def button-container
-  {:flex-grow 1})
+  [actions]
+  {:flex-direction     (if (= actions :two-vertical-actions) :column :row)
+   :justify-content    :space-around
+   :padding-vertical   12
+   :gap                12
+   :padding-horizontal 20})
 
 (def description-top
   {:flex-direction  :row

src/quo/components/drawers/bottom_actions/view.cljs

@@ -30,8 +30,7 @@
       [:button-two-props {:optional true} [:maybe :map]]
       [:scroll? {:optional true} [:maybe :boolean]]
       [:blur? {:optional true} [:maybe :boolean]]
-      [:container-style {:optional true} [:maybe :map]]
-      [:buttons-container-style {:optional true} [:maybe :map]]]]]
+      [:container-style {:optional true} [:maybe :map]]]]]
    :any])
 
 (def ^:private role-icon
@@ -43,7 +42,7 @@
 (defn- view-internal
   [{:keys [actions description description-text description-top-text error-message role button-one-label
            button-two-label blur? button-one-props button-two-props scroll? container-style
-           buttons-container-style context-tag-props]}]
+           context-tag-props]}]
   (let [theme (quo.theme/use-theme)]
     [rn/view
      {:style (merge (style/container scroll? blur? theme) container-style)}
@@ -73,13 +72,12 @@
             :context (i18n/label (keyword "t" role))}
            context-tag-props)]])
 
-     [rn/view {:style (style/buttons-container actions buttons-container-style)}
+     [rn/view {:style (style/buttons-container actions)}
       (when (or (= actions :two-actions)
                 (= actions :two-vertical-actions))
         [button/button
          (merge
           {:size                40
-           :container-style     style/button-container
            :background          (when (or blur? scroll?) :blur)
            :theme               theme
            :accessibility-label :button-two}
@@ -88,7 +86,6 @@
       [button/button
        (merge
         {:size                40
-         :container-style     style/button-container
          :background          (when (or blur? scroll?) :blur)
          :theme               theme
          :accessibility-label :button-one}

src/quo/components/list_items/approval_info/component_spec.cljs

@@ -28,7 +28,6 @@
         {:type            :spending-cap
          :label           "Spending Cap"
          :button-label    "Edit"
-         :button-icon     :i/options
          :on-button-press on-button-press
          :avatar-props    {:image "image"}}])
       (h/fire-event :press (h/get-by-text "Edit"))

src/quo/components/list_items/approval_info/view.cljs

@@ -107,7 +107,7 @@
           :style  (style/description blur? theme)}
          description])]
      (when (= type :account) [tiny-tag/view {:label tag-label}])
-     (when (and (= type :spending-cap) button-icon)
+     (when (= type :spending-cap)
        [button/button
         {:type      :outline
          :size      24

src/quo/components/list_items/dapp/style.cljs

@@ -47,12 +47,3 @@
 (defn style-text-value
   [theme]
   {:color (colors/theme-colors colors/neutral-50 colors/white theme)})
-
-(def initials-avatar-container
-  {:width  32
-   :height 32})
-
-(def image-avatar
-  {:width         32
-   :height        32
-   :border-radius 32})

src/quo/components/list_items/dapp/view.cljs

@@ -1,6 +1,5 @@
 (ns quo.components.list-items.dapp.view
   (:require
-    [quo.components.avatars.user-avatar.view :as user-avatar]
     [quo.components.list-items.dapp.style :as style]
     [quo.components.markdown.text :as text]
     [quo.theme :as quo.theme]
@@ -21,15 +20,9 @@
       :on-press-in         on-press-in
       :on-press-out        on-press-out}
      [rn/view {:style style/container-info}
-      (if (:avatar dapp)
-        [fast-image/fast-image
-         {:source (:avatar dapp)
-          :style  style/image-avatar}]
-        [rn/view {:style style/initials-avatar-container}
-         [user-avatar/initials-avatar
-          {:full-name           (:name dapp)
-           :size                :small
-           :customization-color (:customization-color dapp)}]])
+      [fast-image/fast-image
+       {:source (:avatar dapp)
+        :style  {:width 32 :height 32}}]
       [rn/view {:style style/user-info}
        [text/text
         {:weight          :semi-bold

src/quo/components/settings/data_item/view.cljs

@@ -121,7 +121,6 @@
       [:card? {:optional true} [:maybe :boolean]]
       [:right-icon {:optional true} [:maybe :keyword]]
       [:right-content {:optional true} [:maybe :map]]
-      [:icon-color {:optional true} [:maybe :schema.common/customization-color]]
       [:status {:optional true} [:maybe [:enum :default :loading]]]
       [:subtitle-type {:optional true} [:maybe [:enum :default :icon :network :account :editable]]]
       [:size {:optional true} [:maybe [:enum :default :small :large]]]

src/quo/components/wallet/swap_input/component_spec.cljs

@@ -1,31 +0,0 @@
-(ns quo.components.wallet.swap-input.component-spec
-  (:require [quo.components.wallet.swap-input.view :as swap-input]
-            [test-helpers.component :as h]))
-
-(h/describe "Wallet: Swap Input"
-  (h/test "should render correctly with props"
-    (h/render-with-theme-provider
-     [swap-input/view
-      {:type              :pay
-       :error?            false
-       :token             "SNT"
-       :status            :default
-       :currency-symbol   "€"
-       :value             "5"
-       :fiat-value        "1.50"
-       :network-tag-props {:title "Max: 200 SNT"}}])
-    (h/is-truthy (h/get-by-label-text :swap-input))
-    (h/is-truthy (h/get-by-text "SNT"))
-    (h/is-truthy (h/get-by-text "€1.50"))
-    (h/is-truthy (h/get-by-text "Max: 200 SNT")))
-
-  (h/test "should render correctly with approval label"
-    (h/render-with-theme-provider
-     [swap-input/view
-      {:type :pay
-       :show-approval-label? true
-       :approval-label-props
-       {:status       :approve
-        :token-value  "10"
-        :token-symbol "SNT"}}])
-    (h/is-truthy (h/get-by-text "Approve 10 SNT"))))

src/quo/components/wallet/swap_input/style.cljs

@@ -1,74 +0,0 @@
-(ns quo.components.wallet.swap-input.style
-  (:require [quo.foundations.colors :as colors]
-            [quo.foundations.typography :as typography]))
-
-(defn- border-color
-  [theme]
-  (colors/theme-colors colors/neutral-10 colors/neutral-80 theme))
-
-(defn- loader-color
-  [theme]
-  (colors/theme-colors colors/neutral-5 colors/neutral-90 theme))
-
-(defn content
-  [theme]
-  {:border-width     1
-   :border-radius    16
-   :border-color     (border-color theme)
-   :background-color (colors/theme-colors colors/white colors/neutral-95 theme)})
-
-(defn row-1
-  [loading?]
-  {:padding        12
-   :gap            8
-   :align-items    (if loading? :center :flex-end)
-   :flex-direction :row})
-
-(defn row-1-loader
-  [theme]
-  {:width            74
-   :height           14
-   :border-radius    6
-   :background-color (loader-color theme)})
-
-(def input-container
-  {:flex           1
-   :flex-direction :row
-   :gap            5
-   :height         32
-   :align-items    :flex-end})
-
-(defn input
-  [disabled? error? theme]
-  (assoc typography/font-semi-bold
-         :font-size   27
-         :flex-shrink 1
-         :padding     0
-         :color       (cond
-                        error?    (colors/resolve-color :danger theme)
-                        disabled? (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)
-                        :else     (colors/theme-colors colors/neutral-100 colors/white theme))
-         :line-height 32))
-
-(defn token-symbol
-  [theme]
-  {:padding-bottom 3
-   :color          (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)})
-
-(defn row-2
-  [align-right?]
-  {:flex-direction  :row
-   :justify-content (if align-right? :flex-end :space-between)
-   :align-items     :center
-   :padding         12})
-
-(defn row-2-loader
-  [theme]
-  {:width            80
-   :height           10
-   :margin-vertical  7
-   :border-radius    6
-   :background-color (loader-color theme)})
-
-(def fiat-amount
-  {:color colors/neutral-50})

src/quo/components/wallet/swap_input/view.cljs

@@ -1,121 +0,0 @@
-(ns quo.components.wallet.swap-input.view
-  (:require [oops.core :as oops]
-            [quo.components.avatars.token-avatar.view :as token-avatar]
-            [quo.components.buttons.button.view :as buttons]
-            [quo.components.dividers.divider-line.view :as divider-line]
-            [quo.components.markdown.text :as text]
-            [quo.components.tags.network-tags.view :as network-tag]
-            [quo.components.wallet.approval-label.schema :as approval-label.schema]
-            [quo.components.wallet.approval-label.view :as approval-label]
-            [quo.components.wallet.swap-input.style :as style]
-            [quo.foundations.colors :as colors]
-            quo.theme
-            [react-native.core :as rn]
-            [schema.core :as schema]))
-
-(def ?schema
-  [:=>
-   [:catn
-    [:props
-     [:map {:closed true}
-      [:type {:optional true} [:maybe [:enum :pay :receive]]]
-      [:status {:optional true} [:maybe [:enum :default :disabled :loading]]]
-      [:token {:optional true} [:maybe :string]]
-      [:value {:optional true} [:maybe :string]]
-      [:default-value {:optional true} [:maybe :string]]
-      [:currency-symbol {:optional true} [:maybe :string]]
-      [:fiat-value {:optional true} [:maybe :string]]
-      [:show-approval-label? {:optional true} [:maybe :boolean]]
-      [:error? {:optional true} [:maybe :boolean]]
-      [:show-keyboard? {:optional true} [:maybe :boolean]]
-      [:approval-label-props {:optional true} [:maybe approval-label.schema/?schema]]
-      [:network-tag-props {:optional true} [:maybe :map]]
-      [:on-change-text {:optional true} [:maybe fn?]]
-      [:enable-swap? {:optional true} [:maybe :boolean]]
-      [:on-swap-press {:optional true} [:maybe fn?]]
-      [:on-token-press {:optional true} [:maybe fn?]]
-      [:on-max-press {:optional true} [:maybe fn?]]
-      [:customization-color {:optional true} [:maybe :schema.common/customization-color]]
-      [:container-style {:optional true} [:maybe :map]]]]]
-   :any])
-
-(defn view-internal
-  [{:keys [type status token value fiat-value show-approval-label? error? network-tag-props
-           approval-label-props default-value enable-swap?
-           currency-symbol on-change-text show-keyboard?
-           container-style on-swap-press on-token-press on-max-press]}]
-  (let [theme             (quo.theme/use-theme)
-        pay?              (= type :pay)
-        disabled?         (= status :disabled)
-        loading?          (= status :loading)
-        controlled-input? (some? value)
-        input-ref         (rn/use-ref-atom nil)
-        set-input-ref     (rn/use-callback (fn [ref] (reset! input-ref ref)) [])
-        focus-input       (rn/use-callback (fn []
-                                             (some-> @input-ref
-                                                     (oops/ocall "focus")))
-                                           [input-ref])]
-    [rn/view
-     {:style               container-style
-      :accessibility-label :swap-input}
-     [rn/view {:style (style/content theme)}
-      [rn/view
-       {:style (style/row-1 loading?)}
-       [rn/pressable {:on-press on-token-press}
-        [token-avatar/view
-         {:type  :asset
-          :token token}]]
-       (if loading?
-         [rn/view {:style (style/row-1-loader theme)}]
-         [:<>
-          [rn/pressable
-           {:style    style/input-container
-            :on-press focus-input}
-           [rn/text-input
-            (cond-> {:ref                      set-input-ref
-                     :style                    (style/input disabled? error? theme)
-                     :placeholder-text-color   (colors/theme-colors colors/neutral-40
-                                                                    colors/neutral-50
-                                                                    theme)
-                     :keyboard-type            :numeric
-                     :auto-focus               true
-                     :on-change-text           on-change-text
-                     :show-soft-input-on-focus show-keyboard?
-                     :default-value            default-value
-                     :placeholder              "0"}
-              controlled-input? (assoc :value value))]
-           [text/text
-            {:size   :paragraph-2
-             :weight :semi-bold
-             :style  (style/token-symbol theme)}
-            token]]
-          (when (and pay? enable-swap?)
-            [buttons/button
-             {:type       :outline
-              :size       32
-              :on-press   on-swap-press
-              :icon-only? true}
-             :i/reorder])])]
-      [divider-line/view]
-      [rn/view
-       {:style (style/row-2 (or (not pay?) loading?))}
-       (when-not loading?
-         [:<>
-          (when pay?
-            [rn/pressable {:on-press on-max-press}
-             [network-tag/view
-              (assoc network-tag-props
-                     :status
-                     (if error? :error :default))]])
-          [text/text
-           {:size   :paragraph-2
-            :style  style/fiat-amount
-            :weight :medium}
-           (str currency-symbol fiat-value)]])
-       (when loading?
-         [rn/view {:style (style/row-2-loader theme)}])]]
-     (when (and (not= status :loading) (= type :pay) show-approval-label?)
-       [approval-label/view
-        approval-label-props])]))
-
-(def view (schema/instrument #'view-internal ?schema))

src/quo/core.cljs

@@ -186,7 +186,6 @@
     quo.components.wallet.progress-bar.view
     quo.components.wallet.required-tokens.view
     quo.components.wallet.summary-info.view
-    quo.components.wallet.swap-input.view
     quo.components.wallet.token-input.view
     quo.components.wallet.transaction-progress.view
     quo.components.wallet.transaction-summary.view
@@ -473,7 +472,6 @@
 (def progress-bar quo.components.wallet.progress-bar.view/view)
 (def required-tokens quo.components.wallet.required-tokens.view/view)
 (def summary-info quo.components.wallet.summary-info.view/view)
-(def swap-input quo.components.wallet.swap-input.view/view)
 (def network-link quo.components.wallet.network-link.view/view)
 (def token-input quo.components.wallet.token-input.view/view)
 (def wallet-overview quo.components.wallet.wallet-overview.view/view)

src/quo/core_spec.cljs

@@ -112,7 +112,6 @@
     quo.components.wallet.progress-bar.component-spec
     quo.components.wallet.required-tokens.component-spec
     quo.components.wallet.summary-info.component-spec
-    quo.components.wallet.swap-input.component-spec
     quo.components.wallet.token-input.component-spec
     quo.components.wallet.transaction-progress.component-spec
     quo.components.wallet.transaction-summary.component-spec

src/quo/foundations/resources.cljs

@@ -43,7 +43,6 @@
    :gnosis   (js/require "../resources/images/networks/Gnosis.png")
    :hermez   (js/require "../resources/images/networks/Hermez.png")
    :optimism (js/require "../resources/images/networks/Optimism.png")
-   :paraswap (js/require "../resources/images/networks/Paraswap.png")
    :polygon  (js/require "../resources/images/networks/Polygon.png")
    :scroll   (js/require "../resources/images/networks/Scroll.png")
    :taiko    (js/require "../resources/images/networks/Taiko.png")

src/react_native/wallet_connect.cljs

@@ -62,17 +62,16 @@
               (bean/->js {:id         id
                           :namespaces approved-namespaces})))
 
-(defn disconnect-session
-  [{:keys [web3-wallet reason topic]}]
-  (oops/ocall web3-wallet
-              "disconnectSession"
-              (bean/->js {:topic  topic
-                          :reason reason})))
-
 (defn get-active-sessions
   [web3-wallet]
   (oops/ocall web3-wallet "getActiveSessions"))
 
+(defn core-pairing-disconnnect
+  [web3-wallet topic]
+  (oops/ocall web3-wallet
+              "core.pairing.disconnect"
+              (bean/->js {:topic topic})))
+
 (defn core-pairing-pair
   [web3-wallet url]
   (oops/ocall web3-wallet

src/status_im/constants.cljs

@@ -45,11 +45,6 @@
 (def ^:const activity-center-membership-status-accepted 2)
 (def ^:const activity-center-membership-status-declined 3)
 
-;; Choose the maximum number of notifications that *usually/safely* fit on
-;; most screens, so that the UI doesn't have to needlessly render
-;; notifications.
-(def ^:const notifications-per-page 7)
-
 (def ^:const mute-for-15-mins-type 1)
 (def ^:const mute-for-1-hour-type 2)
 (def ^:const mute-for-8-hours-type 3)
@@ -281,21 +276,16 @@
   #{wallet-connect-personal-sign-method
     wallet-connect-eth-sign-method
     wallet-connect-eth-send-transaction-method
-    ;; NOTE: disabled, as we have no clear use cases for it and other wallets don't support it
-    ;; wallet-connect-eth-sign-transaction-method
+    wallet-connect-eth-sign-transaction-method
     wallet-connect-eth-sign-typed-method
     wallet-connect-eth-sign-typed-v4-method})
 (def ^:const wallet-connect-supported-events #{"accountsChanged" "chainChanged"})
 (def ^:const wallet-connect-session-proposal-event "session_proposal")
 (def ^:const wallet-connect-session-request-event "session_request")
-(def ^:const wallet-connect-session-delete-event "session_delete")
 (def ^:const wallet-connect-user-rejected-error-key "USER_REJECTED")
-(def ^:const wallet-connect-user-disconnected-reason-key "USER_DISCONNECTED")
 
 (def ^:const transaction-pending-type-wallet-connect-transfer "WalletConnectTransfer")
 
-(def ^:const token-sort-priority {"SNT" 1 "STT" 1 "ETH" 2 "DAI" 3})
-
 (def ^:const dapp-permission-contact-code "contact-code")
 (def ^:const dapp-permission-web3 "web3")
 (def ^:const dapp-permission-qr-code "qr-code")
@@ -516,9 +506,6 @@
 (def ^:const optimism-full-name "Optimism")
 (def ^:const arbitrum-full-name "Arbitrum")
 
-(def ^:const sepolia-full-name "Sepolia")
-(def ^:const goerli-full-name "Goerli")
-
 (def ^:const mainnet-network-name :mainnet)
 (def ^:const ethereum-network-name :ethereum)
 (def ^:const optimism-network-name :optimism)
@@ -580,8 +567,5 @@
 (def ^:const max-recommended-slippage 5)
 (def ^:const max-slippage-decimal-places 2)
 (def ^:const swap-default-provider
-  {:name                     :paraswap
-   :full-name                "Paraswap"
-   :color                    :blue
-   :contract-address         "0xdef171fe48cf0115b1d80b88dc8eab59176fee57"
+  {:name                     "Paraswap"
    :terms-and-conditions-url "https://files.paraswap.io/tos_v4.pdf"})

src/status_im/contexts/communities/actions/accounts_selection/effects.cljs

@@ -27,7 +27,7 @@
        :on-error   #(p-reject (str "failed to sign data\n" %))}))))
 
 (defn- edit-shared-addresses-for-community
-  [community-id signatures addresses-to-reveal airdrop-address _share-future-addresses?]
+  [community-id signatures addresses-to-reveal airdrop-address]
   (promesa/create
    (fn [p-resolve p-reject]
      (rpc/call
@@ -41,16 +41,15 @@
        :on-error    p-reject}))))
 
 (defn- request-to-join
-  [community-id signatures addresses-to-reveal airdrop-address share-future-addresses?]
+  [community-id signatures addresses-to-reveal airdrop-address]
   (promesa/create
    (fn [p-resolve p-reject]
      (rpc/call
       {:method      :wakuext_requestToJoinCommunity
-       :params      [{:communityId          community-id
-                      :signatures           signatures
-                      :addressesToReveal    addresses-to-reveal
-                      :airdropAddress       airdrop-address
-                      :shareFutureAddresses share-future-addresses?}]
+       :params      [{:communityId       community-id
+                      :signatures        signatures
+                      :addressesToReveal addresses-to-reveal
+                      :airdropAddress    airdrop-address}]
        :js-response true
        :on-success  p-resolve
        :on-error    p-reject}))))
@@ -65,18 +64,15 @@
 
 (defn- sign-and-call-endpoint
   [{:keys [community-id password pub-key
-           addresses-to-reveal airdrop-address share-future-addresses?
+           addresses-to-reveal airdrop-address
            on-success on-error
            callback]}]
-  (-> (promesa/let [sign-params (generate-requests-for-signing pub-key
-                                                               community-id
-                                                               addresses-to-reveal)
+  (-> (promesa/let [sign-params (generate-requests-for-signing pub-key community-id addresses-to-reveal)
                     signatures  (sign-data sign-params password)
                     result      (callback community-id
                                           signatures
                                           addresses-to-reveal
-                                          airdrop-address
-                                          share-future-addresses?)]
+                                          airdrop-address)]
         (run-callback-or-event on-success result))
       (promesa/catch #(run-callback-or-event on-error %))))
 
@@ -91,7 +87,6 @@
       [:or [:set string?]
        [:sequential string?]]]
      [:airdrop-address string?]
-     [:share-future-addresses? boolean?]
      [:on-success [:or fn? :schema.re-frame/event]]
      [:on-error [:or fn? :schema.re-frame/event]]
      [:callback fn?]]]

src/status_im/contexts/communities/actions/accounts_selection/events.cljs

@@ -17,12 +17,13 @@
 (rf/reg-event-fx :communities/initialize-permission-addresses initialize-permission-addresses)
 
 (defn do-init-permission-addresses
-  [{:keys [db]} [community-id revealed-accounts share-future-addresses?]]
+  [{:keys [db]} [community-id revealed-accounts]]
   (let [wallet-accounts     (utils/sorted-operable-non-watch-only-accounts db)
         addresses-to-reveal (if (seq revealed-accounts)
                               (set (keys revealed-accounts))
                               ;; Reveal all addresses as fallback.
                               (set (map :address wallet-accounts)))
+
         ;; When there are no revealed addresses, such as when joining a
         ;; community, use first address for airdrops.
         airdrop-address     (or (->> revealed-accounts
@@ -34,7 +35,10 @@
                                      first
                                      :address))]
     {:db (-> db
-             (assoc-in [:communities/selected-share-all-addresses community-id] share-future-addresses?)
+             ;; Set to false by default while we don't persist the user's choice
+             ;; in status-go, otherwise whenever the view is mounted, the choice
+             ;; of selected addresses won't be respected.
+             (assoc-in [:communities/selected-share-all-addresses community-id] false)
              (assoc-in [:communities/all-addresses-to-reveal community-id] addresses-to-reveal)
              (assoc-in [:communities/all-airdrop-addresses community-id] airdrop-address))
      :fx [[:dispatch
@@ -56,44 +60,36 @@
   is selecting an airdrop address, we must submit to status-go the current
   choice of addresses to share, and vice-versa. If we omit addresses to share,
   status-go will default to all available."
-  [{:keys [db]}
-   [{:keys [community-id password on-success addresses airdrop-address share-future-addresses?]}]]
-  (let [pub-key                 (get-in db [:profile/profile :public-key])
-        wallet-accounts         (utils/sorted-operable-non-watch-only-accounts db)
-        addresses-to-reveal     (if (seq addresses)
-                                  (set addresses)
-                                  (get-in db [:communities/all-addresses-to-reveal community-id]))
-        new-airdrop-address     (if (contains? addresses-to-reveal airdrop-address)
-                                  airdrop-address
-                                  (->> wallet-accounts
-                                       (filter #(contains? addresses-to-reveal (:address %)))
-                                       first
-                                       :address))
-        share-future-addresses? (if (nil? share-future-addresses?)
-                                  (get-in db [:communities/selected-share-all-addresses community-id])
-                                  share-future-addresses?)]
+  [{:keys [db]} [{:keys [community-id password on-success addresses airdrop-address]}]]
+  (let [pub-key             (get-in db [:profile/profile :public-key])
+        wallet-accounts     (utils/sorted-operable-non-watch-only-accounts db)
+        addresses-to-reveal (if (seq addresses)
+                              (set addresses)
+                              (get-in db [:communities/all-addresses-to-reveal community-id]))
+        new-airdrop-address (if (contains? addresses-to-reveal airdrop-address)
+                              airdrop-address
+                              (->> wallet-accounts
+                                   (filter #(contains? addresses-to-reveal (:address %)))
+                                   first
+                                   :address))]
     {:fx [[:effects.community/edit-shared-addresses
-           {:community-id            community-id
-            :password                password
-            :pub-key                 pub-key
-            :addresses-to-reveal     addresses-to-reveal
-            :share-future-addresses? share-future-addresses?
-            :airdrop-address         new-airdrop-address
-            :on-success              (fn []
-                                       (when (fn? on-success)
-                                         (on-success addresses-to-reveal
-                                                     new-airdrop-address
-                                                     share-future-addresses?))
-                                       (rf/dispatch [:communities/edit-shared-addresses-success
-                                                     community-id addresses-to-reveal airdrop-address]))
-            :on-error                [:communities/edit-shared-addresses-failure community-id]}]]}))
+           {:community-id        community-id
+            :password            password
+            :pub-key             pub-key
+            :addresses-to-reveal addresses-to-reveal
+            :airdrop-address     new-airdrop-address
+            :on-success          (fn []
+                                   (when (fn? on-success)
+                                     (on-success addresses-to-reveal new-airdrop-address))
+                                   (rf/dispatch [:communities/edit-shared-addresses-success
+                                                 community-id addresses-to-reveal airdrop-address]))
+            :on-error            [:communities/edit-shared-addresses-failure community-id]}]]}))
 
 (rf/reg-event-fx :communities/edit-shared-addresses edit-shared-addresses)
 
 (rf/reg-event-fx :communities/edit-shared-addresses-success
- (fn [_ [community-id addresses-to-reveal airdrop-address share-future-addresses?]]
+ (fn [_ [community-id addresses-to-reveal airdrop-address]]
    {:fx [[:dispatch [:communities/set-airdrop-address community-id airdrop-address]]
-         [:dispatch [:communities/set-share-all-addresses community-id share-future-addresses?]]
          [:dispatch [:communities/set-addresses-to-reveal community-id addresses-to-reveal]]]}))
 
 (rf/reg-event-fx :communities/edit-shared-addresses-failure

src/status_im/contexts/communities/actions/accounts_selection/events_test.cljs

@@ -70,7 +70,7 @@
       (is
        (match?
         {:db (-> (:db cofx)
-                 (assoc-in [:communities/selected-share-all-addresses community-id] true)
+                 (assoc-in [:communities/selected-share-all-addresses community-id] false)
                  (assoc-in [:communities/all-addresses-to-reveal community-id] addresses-to-reveal)
                  (assoc-in [:communities/all-airdrop-addresses community-id] airdrop-address))
          :fx [[:dispatch
@@ -82,7 +82,7 @@
               [:dispatch
                [:communities/check-permissions-to-join-during-selection community-id
                 addresses-to-reveal]]]}
-        (sut/do-init-permission-addresses cofx [community-id revealed-accounts true])))))
+        (sut/do-init-permission-addresses cofx [community-id revealed-accounts])))))
 
   ;; Expect to mark all addresses to be revealed and first one to receive
   ;; airdrops when no addresses were previously revealed.
@@ -93,7 +93,7 @@
       (is
        (match?
         {:db (-> (:db cofx)
-                 (assoc-in [:communities/selected-share-all-addresses community-id] true)
+                 (assoc-in [:communities/selected-share-all-addresses community-id] false)
                  (assoc-in [:communities/all-addresses-to-reveal community-id] addresses-to-reveal))
          :fx [[:dispatch
                [:communities/check-permissions-to-join-community
@@ -101,7 +101,7 @@
               [:dispatch
                [:communities/check-permissions-to-join-during-selection community-id
                 addresses-to-reveal]]]}
-        (sut/do-init-permission-addresses cofx [community-id revealed-accounts true]))))))
+        (sut/do-init-permission-addresses cofx [community-id revealed-accounts]))))))
 
 (deftest edit-shared-addresses-test
   (testing
@@ -109,7 +109,6 @@
     fallback to all wallet addresses"
     (let [pub-key "abcdef"
           revealed-addresses #{"0xB" "0xC"}
-          share-future-addresses? true
           cofx {:db {:profile/profile                     {:public-key pub-key}
                      :communities/all-addresses-to-reveal {community-id revealed-addresses}}}
           airdrop-address "0xB"
@@ -117,24 +116,22 @@
           actual
           (sut/edit-shared-addresses
            cofx
-           [{:community-id            community-id
-             :password                password
-             :airdrop-address         airdrop-address
-             :share-future-addresses? share-future-addresses?
-             :on-success              (fn [new-addresses-to-reveal]
-                                        (is (match? revealed-addresses new-addresses-to-reveal)))}])
+           [{:community-id    community-id
+             :password        password
+             :airdrop-address airdrop-address
+             :on-success      (fn [new-addresses-to-reveal]
+                                (is (match? revealed-addresses new-addresses-to-reveal)))}])
 
           on-success-wrapper (-> actual :fx first second :on-success)]
       (is (match?
            {:fx [[:effects.community/edit-shared-addresses
-                  {:community-id            community-id
-                   :password                password
-                   :pub-key                 pub-key
-                   :addresses-to-reveal     revealed-addresses
-                   :share-future-addresses? share-future-addresses?
-                   :airdrop-address         airdrop-address
-                   :on-success              fn?
-                   :on-error                [:communities/edit-shared-addresses-failure community-id]}]]}
+                  {:community-id        community-id
+                   :password            password
+                   :pub-key             pub-key
+                   :addresses-to-reveal revealed-addresses
+                   :airdrop-address     airdrop-address
+                   :on-success          fn?
+                   :on-error            [:communities/edit-shared-addresses-failure community-id]}]]}
            actual))
 
       (on-success-wrapper)))

src/status_im/contexts/communities/actions/addresses_for_permissions/view.cljs

@@ -203,9 +203,7 @@
                                                                        :addresses-for-permissions])
                                                          (rf/dispatch [:hide-bottom-sheet]))}]))}])
               (rf/dispatch [:communities/set-share-all-addresses id flag-share-all-addresses]))
-            (do
-              (rf/dispatch [:communities/set-share-all-addresses id flag-share-all-addresses])
-              (rf/dispatch [:communities/set-addresses-to-reveal id addresses-to-reveal]))))
+            (rf/dispatch [:communities/set-addresses-to-reveal id addresses-to-reveal])))
         highest-role (rf/sub [:communities/highest-role-for-selection id])
         [unmodified-role _] (rn/use-state highest-role)]
 
@@ -262,8 +260,7 @@
 
         can-edit-addresses? (rf/sub [:communities/can-edit-shared-addresses? id])
 
-        wallet-accounts (rf/sub [:wallet/operable-accounts])
-        joined (rf/sub [:communities/community-joined id])
+        wallet-accounts (rf/sub [:wallet/operable-accounts-without-watched-accounts])
         unmodified-addresses-to-reveal (rf/sub [:communities/addresses-to-reveal id])
         [addresses-to-reveal set-addresses-to-reveal] (rn/use-state unmodified-addresses-to-reveal)
 
@@ -288,6 +285,7 @@
             (set-flag-share-all-addresses new-value)
             (when new-value
               (set-addresses-to-reveal (set (map :address wallet-accounts))))))]
+
     (rn/use-mount
      (fn []
        (when-not flag-share-all-addresses
@@ -312,7 +310,6 @@
                                  flag-share-all-addresses]
        :header                  [quo/page-setting
                                  {:checked?            flag-share-all-addresses
-                                  :disabled?           joined
                                   :customization-color color
                                   :on-change           toggle-flag-share-all-addresses
                                   :setting-text        (i18n/label

src/status_im/contexts/communities/actions/chat/view.cljs

@@ -47,11 +47,12 @@
      :label               (i18n/label :t/view-token-gating)}))
 
 (defn- action-mark-as-read
-  [chat-id]
-  {:icon                :i/mark-as-read
-   :accessibility-label :chat-mark-as-read
-   :on-press            #(hide-sheet-and-dispatch [:chat.ui/mark-all-read-pressed chat-id])
-   :label               (i18n/label :t/mark-as-read)})
+  []
+  (when config/show-not-implemented-features?
+    {:icon                :i/mark-as-read
+     :accessibility-label :chat-mark-as-read
+     :on-press            not-implemented/alert
+     :label               (i18n/label :t/mark-as-read)}))
 
 (defn- action-toggle-muted
   [id muted? muted-till chat-type]
@@ -129,7 +130,7 @@
       (and (not inside-chat?) (not locked?))
       [quo/action-drawer
        [[(when-not hide-view-members? (action-view-members-and-details community-id chat-id))
-         (action-mark-as-read chat-id)
+         (action-mark-as-read)
          (action-toggle-muted chat-id muted muted-till chat-type)
          (action-notification-settings)
          (action-pinned-messages chat-id)
@@ -142,7 +143,7 @@
        [[(action-view-members-and-details community-id chat-id)
          (when token-gated?
            (action-token-requirements))
-         (action-mark-as-read chat-id)
+         (action-mark-as-read)
          (action-toggle-muted chat-id muted muted-till chat-type)
          (action-notification-settings)
          (when config/fetch-messages-enabled?

src/status_im/contexts/communities/events.cljs

@@ -16,7 +16,6 @@
     [status-im.navigation.events :as navigation]
     [status-im.navigation.transitions :as transitions]
     [taoensso.timbre :as log]
-    [utils.collection :as collection-utils]
     [utils.re-frame :as rf]))
 
 (defn handle-community
@@ -373,14 +372,15 @@
     (when (and community joined (not fetching-revealed-accounts))
       {:db (assoc-in db [:communities community-id :fetching-revealed-accounts] true)
        :json-rpc/call
-       [{:method     "wakuext_latestRequestToJoinForCommunity"
-         :params     [community-id]
-         :on-success [:communities/get-revealed-accounts-success community-id on-success]
-         :on-error   (fn [err]
-                       (log/error {:message      "failed to fetch revealed accounts"
-                                   :community-id community-id
-                                   :err          err})
-                       (rf/dispatch [:communities/get-revealed-accounts-failed community-id]))}]})))
+       [{:method      "wakuext_getRevealedAccounts"
+         :params      [community-id (get-in db [:profile/profile :public-key])]
+         :js-response true
+         :on-success  [:communities/get-revealed-accounts-success community-id on-success]
+         :on-error    (fn [err]
+                        (log/error {:message      "failed to fetch revealed accounts"
+                                    :community-id community-id
+                                    :err          err})
+                        (rf/dispatch [:communities/get-revealed-accounts-failed community-id]))}]})))
 
 (rf/reg-event-fx :communities/get-revealed-accounts get-revealed-accounts)
 
@@ -399,18 +399,22 @@
      [:json-rpc/call :schema.common/rpc-call]]]])
 
 (rf/reg-event-fx :communities/get-revealed-accounts-success
- (fn [{:keys [db]} [community-id on-success request-to-join]]
+ (fn [{:keys [db]} [community-id on-success revealed-accounts-js]]
    (when-let [community (get-in db [:communities community-id])]
-     (let [revealed-accounts (collection-utils/index-by :address (:revealedAccounts request-to-join))
-           share-future-addresses? (:shareFutureAddresses request-to-join)
+     (let [revealed-accounts
+           (reduce
+            (fn [acc {:keys [address] :as revealed-account}]
+              (assoc acc address revealed-account))
+            {}
+            (data-store.communities/<-revealed-accounts-rpc revealed-accounts-js))
+
            community-with-revealed-accounts
            (-> community
                (assoc :revealed-accounts revealed-accounts)
-               (assoc :share-future-addresses? share-future-addresses?)
                (dissoc :fetching-revealed-accounts))]
        {:db (assoc-in db [:communities community-id] community-with-revealed-accounts)
         :fx [(when (vector? on-success)
-               [:dispatch (conj on-success revealed-accounts share-future-addresses?)])]}))))
+               [:dispatch (conj on-success revealed-accounts)])]}))))
 
 (rf/reg-event-fx :communities/get-revealed-accounts-failed
  (fn [{:keys [db]} [community-id]]

src/status_im/contexts/communities/events_test.cljs

@@ -146,8 +146,8 @@
             effects   (events/get-revealed-accounts {:db db} [community-id])]
         (is (match? (assoc-in db [:communities community-id :fetching-revealed-accounts] true)
                     (:db effects)))
-        (is (match? {:method "wakuext_latestRequestToJoinForCommunity"
-                     :params [community-id]}
+        (is (match? {:method "wakuext_getRevealedAccounts"
+                     :params [community-id "profile-public-key"]}
                     (-> effects :json-rpc/call first (select-keys [:method :params]))))))))
 
 (deftest handle-community-test

src/status_im/contexts/communities/overview/events.cljs

@@ -117,14 +117,13 @@
                      {:community community-name})}]]]})))
 
 (defn request-to-join-with-signatures
-  [_ [community-id addresses-to-reveal signatures share-future-addresses?]]
+  [_ [community-id addresses-to-reveal signatures]]
   {:fx [[:json-rpc/call
          [{:method      "wakuext_requestToJoinCommunity"
-           :params      [{:communityId          community-id
-                          :signatures           signatures
-                          :addressesToReveal    addresses-to-reveal
-                          :shareFutureAddresses share-future-addresses?
-                          :airdropAddress       (first addresses-to-reveal)}]
+           :params      [{:communityId       community-id
+                          :signatures        signatures
+                          :addressesToReveal addresses-to-reveal
+                          :airdropAddress    (first addresses-to-reveal)}]
            :js-response true
            :on-success  [:communities/requested-to-join]
            :on-error    [:communities/requested-to-join-error community-id]}]]]})
@@ -154,18 +153,16 @@
 (defn request-to-join-with-addresses
   [{:keys [db]}
    [{:keys [community-id password]}]]
-  (let [pub-key                 (get-in db [:profile/profile :public-key])
-        addresses-to-reveal     (get-in db [:communities/all-addresses-to-reveal community-id])
-        share-future-addresses? (get-in db [:communities/selected-share-all-addresses community-id])
-        airdrop-address         (get-in db [:communities/all-airdrop-addresses community-id])]
+  (let [pub-key             (get-in db [:profile/profile :public-key])
+        addresses-to-reveal (get-in db [:communities/all-addresses-to-reveal community-id])
+        airdrop-address     (get-in db [:communities/all-airdrop-addresses community-id])]
     {:fx [[:effects.community/request-to-join
-           {:community-id            community-id
-            :password                password
-            :pub-key                 pub-key
-            :addresses-to-reveal     addresses-to-reveal
-            :airdrop-address         airdrop-address
-            :share-future-addresses? share-future-addresses?
-            :on-success              [:communities/requested-to-join]
-            :on-error                [:communities/requested-to-join-error community-id]}]]}))
+           {:community-id        community-id
+            :password            password
+            :pub-key             pub-key
+            :addresses-to-reveal addresses-to-reveal
+            :airdrop-address     airdrop-address
+            :on-success          [:communities/requested-to-join]
+            :on-error            [:communities/requested-to-join-error community-id]}]]}))
 
 (rf/reg-event-fx :communities/request-to-join-with-addresses request-to-join-with-addresses)

src/status_im/contexts/communities/overview/events_test.cljs

@@ -37,22 +37,19 @@
                 (sut/sign-data cofx [community-id password sign-params])))))
 
 (deftest request-to-join-with-signatures-test
-  (let [cofx                    {:db {}}
-        addresses-to-reveal     [account-pub-key "0x2"]
-        share-future-addresses? true
-        signatures              ["11111" "222222"]
-        expected                {:fx [[:json-rpc/call
-                                       [{:method      "wakuext_requestToJoinCommunity"
-                                         :params      [{:communityId          community-id
-                                                        :signatures           signatures
-                                                        :addressesToReveal    addresses-to-reveal
-                                                        :shareFutureAddresses share-future-addresses?
-                                                        :airdropAddress       "0x1"}]
-                                         :js-response true
-                                         :on-success  [:communities/requested-to-join]
-                                         :on-error    [:communities/requested-to-join-error
-                                                       community-id]}]]]}]
+  (let [cofx                {:db {}}
+        addresses-to-reveal [account-pub-key "0x2"]
+        signatures          ["11111" "222222"]
+        expected            {:fx [[:json-rpc/call
+                                   [{:method      "wakuext_requestToJoinCommunity"
+                                     :params      [{:communityId       community-id
+                                                    :signatures        signatures
+                                                    :addressesToReveal addresses-to-reveal
+                                                    :airdropAddress    "0x1"}]
+                                     :js-response true
+                                     :on-success  [:communities/requested-to-join]
+                                     :on-error    [:communities/requested-to-join-error
+                                                   community-id]}]]]}]
     (is (match? expected
                 (sut/request-to-join-with-signatures cofx
-                                                     [community-id addresses-to-reveal signatures
-                                                      share-future-addresses?])))))
+                                                     [community-id addresses-to-reveal signatures])))))

src/status_im/contexts/onboarding/enable_notifications/view.cljs

@@ -38,7 +38,7 @@
                               (rf/dispatch [:push-notifications/switch true])
                               (rf/dispatch [:navigate-to-within-stack
                                             [:screen/onboarding.welcome
-                                             :screen/onboarding.generating-keys]]))
+                                             :screen/onboarding.enable-notifications]]))
        :type                :primary
        :icon-left           :i/notifications
        :accessibility-label :enable-notifications-button
@@ -52,7 +52,7 @@
                                nil)
                               (rf/dispatch [:navigate-to-within-stack
                                             [:screen/onboarding.welcome
-                                             :screen/onboarding.generating-keys]]))
+                                             :screen/onboarding.enable-notifications]]))
        :accessibility-label :enable-notifications-later-button
        :type                :grey
        :background          :blur

src/status_im/contexts/onboarding/events.cljs

@@ -73,9 +73,7 @@
                                       :onboarding/navigated-to-enter-seed-phrase-from-screen
                                       :screen/onboarding.new-to-status)]]
                :dispatch-later [{:ms       constants/onboarding-generating-keys-animation-duration-ms
-                                 :dispatch [:navigate-to-within-stack
-                                            [:screen/onboarding.enable-notifications
-                                             :screen/onboarding.generating-keys]]}]
+                                 :dispatch [:init-root :screen/onboarding.enable-notifications]}]
                :db             (-> db
                                    (dissoc :profile/login)
                                    (dissoc :auth-method)
@@ -189,3 +187,14 @@
                                            {:key-uid key-uid
                                             :error   %})}))))
 
+(rf/defn navigate-to-identifiers
+  {:events [:onboarding/navigate-to-identifiers]}
+  [{:keys [db]}]
+  (if (:onboarding/generated-keys? db)
+    {:dispatch [:navigate-to-within-stack
+                [:screen/onboarding.identifiers
+                 (get db
+                      :onboarding/navigated-to-enter-seed-phrase-from-screen
+                      :screen/onboarding.new-to-status)]]}
+    {:dispatch-later [{:ms       constants/onboarding-generating-keys-navigation-retry-ms
+                       :dispatch [:onboarding/navigate-to-identifiers]}]}))

src/status_im/contexts/preview/quo/list_items/dapp.cljs

@@ -13,17 +13,14 @@
                :value "Default"}
               {:key   :active
                :value "Active"}]}
-   {:key     :dapp
+   {:key     :action
     :type    :select
-    :options [{:value "With icon"
-               :key   {:avatar (resources/get-dapp :coingecko)
-                       :name   "Coingecko"
-                       :value  "coingecko.com"}}
-              {:value "Without icon"
-               :key   {:avatar              nil
-                       :name                "Coingecko"
-                       :value               "coingecko.com"
-                       :customization-color :blue}}]}])
+    :options [{:key   :none
+               :value "None"}
+              {:key   :icon
+               :value "Icon"}]}
+   {:key  :blur?
+    :type :boolean}])
 
 (defn preview
   []

src/status_im/contexts/preview/quo/main.cljs

@@ -212,7 +212,6 @@
     [status-im.contexts.preview.quo.wallet.progress-bar :as progress-bar]
     [status-im.contexts.preview.quo.wallet.required-tokens :as required-tokens]
     [status-im.contexts.preview.quo.wallet.summary-info :as summary-info]
-    [status-im.contexts.preview.quo.wallet.swap-input :as swap-input]
     [status-im.contexts.preview.quo.wallet.token-input :as token-input]
     [status-im.contexts.preview.quo.wallet.transaction-progress :as transaction-progress]
     [status-im.contexts.preview.quo.wallet.transaction-summary :as
@@ -571,7 +570,6 @@
                        {:name      :required-tokens
                         :component required-tokens/view}
                        {:name :summary-info :component summary-info/view}
-                       {:name :swap-input :component swap-input/view}
                        {:name :token-input :component token-input/view}
                        {:name :wallet-activity :component wallet-activity/view}
                        {:name :transaction-progress :component transaction-progress/view}

src/status_im/contexts/preview/quo/wallet/swap_input.cljs

@@ -1,68 +0,0 @@
-(ns status-im.contexts.preview.quo.wallet.swap-input
-  (:require
-    [quo.core :as quo]
-    [quo.foundations.resources :as resources]
-    [react-native.core :as rn]
-    [status-im.contexts.preview.quo.preview :as preview]))
-
-(def descriptor
-  [{:type    :select
-    :key     :type
-    :options [{:key :pay}
-              {:key :receive}]}
-   {:type    :select
-    :key     :status
-    :options [{:key :default}
-              {:key :disabled}
-              {:key :loading}]}
-   {:type    :select
-    :key     :value
-    :options [{:key :token}
-              {:key :fiat}]}
-   {:type :boolean
-    :key  :error?}
-   {:type :boolean
-    :key  :enable-swap?}
-   {:type :boolean
-    :key  :show-approval-label?}
-   (preview/customization-color-option)])
-
-(defn view
-  []
-  (let [[state set-state] (rn/use-state {:type                 :pay
-                                         :error?               false
-                                         :token                "SNT"
-                                         :customization-color  :blue
-                                         :show-approval-label? false
-                                         :enable-swap?         true
-                                         :status               :default
-                                         :currency-symbol      "€"})
-        [value set-value] (rn/use-state "")
-        on-press          (fn [v] (set-value (str value v)))
-        delete            (fn [] (set-value #(subs % 0 (dec (count %)))))]
-    [preview/preview-container
-     {:state      state
-      :set-state  set-state
-      :descriptor descriptor}
-     [quo/swap-input
-      (assoc state
-             :on-swap-press #(js/alert "Swap Pressed")
-             :on-token-press #(js/alert "Token Pressed")
-             :on-max-press #(js/alert "Max Pressed")
-             :value value
-             :fiat-value (str (.toFixed (* value 0.3) 2))
-             :container-style {:margin-bottom 20}
-             :network-tag-props {:title    "Max: 200 SNT"
-                                 :networks [{:source (resources/get-network :ethereum)}]}
-             :approval-label-props
-             {:status              :approve
-              :token-value         "10"
-              :button-props        {:on-press
-                                    #(js/alert "Approve Pressed")}
-              :customization-color (:customization-color state)
-              :token-symbol        "SNT"})]
-     [quo/numbered-keyboard
-      {:left-action :dot
-       :delete-key? true
-       :on-press    on-press
-       :on-delete   delete}]]))

src/status_im/contexts/shell/activity_center/context.cljs

@@ -1,18 +0,0 @@
-(ns status-im.contexts.shell.activity-center.context
-  (:require
-    ["react" :as react]
-    [oops.core :as oops]
-    [react-native.core :as rn]))
-
-(defonce ^:private context
-  (react/createContext {}))
-
-(defn provider
-  [state & children]
-  (into [:> (oops/oget context :Provider) {:value state}]
-        children))
-
-(defn use-context
-  []
-  (let [ctx (rn/use-context context)]
-    {:active-swipeable (oops/oget ctx :activeSwipeable)}))

src/status_im/contexts/shell/activity_center/events.cljs

@@ -15,7 +15,10 @@
 (def defaults
   {:filter-status          :unread
    :filter-type            types/no-type
-   :notifications-per-page constants/notifications-per-page})
+   ;; Choose the maximum number of notifications that *usually/safely* fit on
+   ;; most screens, so that the UI doesn't have to needlessly render
+   ;; notifications.
+   :notifications-per-page 8})
 
 ;;;; Navigation
 

src/status_im/contexts/shell/activity_center/notification/admin/view.cljs

@@ -1,7 +1,6 @@
 (ns status-im.contexts.shell.activity-center.notification.admin.view
   (:require
     [quo.core :as quo]
-    [react-native.core :as rn]
     [status-im.constants :as constants]
     [status-im.contexts.shell.activity-center.notification.common.style :as common-style]
     [status-im.contexts.shell.activity-center.notification.common.view :as common]
@@ -24,50 +23,42 @@
     :text  (i18n/label :t/decline)}])
 
 (defn- swipeable
-  [{:keys [notification extra-fn]} child]
-  (let [{:keys [community-id id
-                membership-status]} notification
-        accept                      (rn/use-callback
-                                     (fn []
-                                       (rf/dispatch [:communities/accept-request-to-join-pressed
-                                                     community-id id]))
-                                     [community-id id])
-        decline                     (rn/use-callback
-                                     (fn []
-                                       (rf/dispatch [:communities/decline-request-to-join-pressed
-                                                     community-id id]))
-                                     [community-id id])]
+  [{:keys [active-swipeable notification extra-fn]} child]
+  (let [{:keys [community-id id membership-status]} notification]
     (cond
       (#{constants/activity-center-membership-status-accepted
          constants/activity-center-membership-status-declined}
        membership-status)
       [common/swipeable
-       {:left-button    common/swipe-button-read-or-unread
-        :left-on-press  common/swipe-on-press-toggle-read
-        :right-button   common/swipe-button-delete
-        :right-on-press common/swipe-on-press-delete
-        :extra-fn       extra-fn}
+       {:left-button      common/swipe-button-read-or-unread
+        :left-on-press    common/swipe-on-press-toggle-read
+        :right-button     common/swipe-button-delete
+        :right-on-press   common/swipe-on-press-delete
+        :active-swipeable active-swipeable
+        :extra-fn         extra-fn}
        child]
 
       (= membership-status constants/activity-center-membership-status-pending)
       [common/swipeable
-       {:left-button    swipe-button-accept
-        :left-on-press  accept
-        :right-button   swipe-button-decline
-        :right-on-press decline
-        :extra-fn       extra-fn}
+       {:left-button      swipe-button-accept
+        :left-on-press    #(rf/dispatch [:communities/accept-request-to-join-pressed community-id id])
+        :right-button     swipe-button-decline
+        :right-on-press   #(rf/dispatch [:communities/decline-request-to-join-pressed community-id
+                                         id])
+        :active-swipeable active-swipeable
+        :extra-fn         extra-fn}
        child]
 
       :else
       child)))
 
 (defn view
-  [{:keys [notification] :as props}]
+  [{:keys [notification set-swipeable-height customization-color] :as props}]
   (let [{:keys [author community-id id membership-status
                 read timestamp]} notification
-        community-name           (rf/sub [:communities/name community-id])
-        community-logo           (rf/sub [:communities/logo community-id])
-        customization-color      (rf/sub [:profile/customization-color])]
+        community                (rf/sub [:communities/community community-id])
+        community-name           (:name community)
+        community-image          (get-in community [:images :thumbnail :uri])]
     [swipeable props
      [quo/activity-log
       {:title               (i18n/label :t/join-request)
@@ -75,13 +66,14 @@
        :icon                :i/add-user
        :timestamp           (datetime/timestamp->relative timestamp)
        :unread?             (not read)
+       :on-layout           set-swipeable-height
        :context             [[common/user-avatar-tag author]
                              (i18n/label :t/wants-to-join)
                              [quo/context-tag
                               {:type           :community
                                :size           24
                                :blur?          true
-                               :community-logo community-logo
+                               :community-logo community-image
                                :community-name community-name}]]
        :items               (condp = membership-status
                               constants/activity-center-membership-status-accepted

src/status_im/contexts/shell/activity_center/notification/common/style.cljs

@@ -4,7 +4,6 @@
 
 (def swipe-action-width 80)
 (def swipe-button-border-radius 16)
-(def swipe-button-margin 8)
 
 (def user-avatar-tag
   {:background-color colors/white-opa-10})

src/status_im/contexts/shell/activity_center/notification/common/view.cljs

@@ -1,12 +1,10 @@
 (ns status-im.contexts.shell.activity-center.notification.common.view
   (:require
-    [oops.core :as oops]
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
     [react-native.gesture :as gesture]
     [status-im.contexts.profile.utils :as profile.utils]
-    [status-im.contexts.shell.activity-center.context :as ac.context]
     [status-im.contexts.shell.activity-center.notification.common.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
@@ -16,7 +14,7 @@
   (let [profile (rf/sub [:contacts/contact-by-identity user-id])]
     [rn/view
      {:on-start-should-set-responder
-      (fn []
+      (fn [_event]
         (rf/dispatch [:navigate-back])
         (rf/dispatch [:chat.ui/show-profile user-id])
         true)}
@@ -35,27 +33,35 @@
            swipe-button
            swipeable-ref
            style]}]
-  (fn [_ drag-x]
-    (let [extra       (extra-fn)
-          opacity     (oops/ocall drag-x :interpolate interpolation-opacity)
-          translate-x (oops/ocall drag-x :interpolate interpolation-translate-x)]
+  (fn [_ ^js drag-x]
+    (let [{:keys [height] :as extra} (extra-fn)
+          opacity                    (.interpolate drag-x interpolation-opacity)
+          translate-x                (.interpolate drag-x interpolation-translate-x)]
       [gesture/rect-button
        {:style               (merge {:border-radius style/swipe-button-border-radius} style)
         :accessibility-label :notification-swipe-action-button
         :on-press            (fn []
                                (when @swipeable-ref
-                                 (oops/ocall @swipeable-ref :close)
+                                 (.close ^js @swipeable-ref)
                                  (reset! active-swipeable nil))
                                (on-press extra))}
        [swipe-button
         {:style {:opacity   opacity
                  :transform [{:translateX translate-x}]
-                 :flex      1
+                 :height    height
                  :width     style/swipe-action-width}}
         extra]])))
 
+(defn- close-active-swipeable
+  [active-swipeable swipeable]
+  (fn [_]
+    (when (and @active-swipeable
+               (not= @active-swipeable @swipeable))
+      (.close ^js @active-swipeable))
+    (reset! active-swipeable @swipeable)))
+
 (defn swipe-button-container
-  [{:keys [style icon text]}]
+  [{:keys [style icon text]} _]
   [rn/animated-view
    {:accessibility-label :notification-swipe
     :style               style}
@@ -97,54 +103,47 @@
   (rf/dispatch [:activity-center.notifications/delete (:id notification)]))
 
 (defn swipeable
-  [{:keys [extra-fn
-           left-button
-           left-on-press
-           right-button
-           right-on-press]}
-   child]
-  (let [{:keys [active-swipeable]} (ac.context/use-context)
-        this-swipeable             (rn/use-ref-atom nil)
-        set-this-swipeable         (rn/use-callback #(reset! this-swipeable %)
-                                                    [this-swipeable])
-        on-swipeable-will-open     (rn/use-callback
-                                    (fn []
-                                      (when (and @active-swipeable
-                                                 (not= @active-swipeable @this-swipeable))
-                                        (oops/ocall @active-swipeable :close))
-                                      (reset! active-swipeable @this-swipeable))
-                                    [@active-swipeable @this-swipeable])]
-    [gesture/swipeable
-     (cond-> {:ref                      set-this-swipeable
-              :accessibility-label      :notification-swipeable
-              :friction                 2
-              :on-swipeable-will-open   on-swipeable-will-open
-              :children-container-style {:padding-horizontal 20}}
-       left-button
-       (assoc :overshoot-left      false
-              :left-threshold      style/swipe-action-width
-              :render-left-actions (render-swipe-action
-                                    {:active-swipeable active-swipeable
-                                     :extra-fn extra-fn
-                                     :interpolation-opacity style/left-swipe-opacity-interpolation-js
-                                     :interpolation-translate-x
-                                     style/left-swipe-translate-x-interpolation-js
-                                     :on-press left-on-press
-                                     :swipe-button left-button
-                                     :swipeable-ref this-swipeable
-                                     :style {:left style/swipe-button-margin}}))
-
-       right-button
-       (assoc :overshoot-right      false
-              :right-threshold      style/swipe-action-width
-              :render-right-actions (render-swipe-action
-                                     {:active-swipeable active-swipeable
-                                      :extra-fn extra-fn
-                                      :interpolation-opacity style/right-swipe-opacity-interpolation-js
-                                      :interpolation-translate-x
-                                      style/right-swipe-translate-x-interpolation-js
-                                      :on-press right-on-press
-                                      :swipe-button right-button
-                                      :swipeable-ref this-swipeable
-                                      :style {:right (- style/swipe-button-margin)}})))
-     child]))
+  [_]
+  (let [swipeable-ref (atom nil)]
+    (fn [{:keys [active-swipeable
+                 extra-fn
+                 left-button
+                 left-on-press
+                 right-button
+                 right-on-press]}
+         & children]
+      (into
+       [gesture/swipeable
+        (merge
+         {:ref                      #(reset! swipeable-ref %)
+          :accessibility-label      :notification-swipeable
+          :friction                 2
+          :on-swipeable-will-open   (close-active-swipeable active-swipeable swipeable-ref)
+          :children-container-style {:padding-horizontal 20}}
+         (when left-button
+           {:overshoot-left      false
+            :left-threshold      style/swipe-action-width
+            :render-left-actions (render-swipe-action
+                                  {:active-swipeable active-swipeable
+                                   :extra-fn extra-fn
+                                   :interpolation-opacity style/left-swipe-opacity-interpolation-js
+                                   :interpolation-translate-x
+                                   style/left-swipe-translate-x-interpolation-js
+                                   :on-press left-on-press
+                                   :swipe-button left-button
+                                   :swipeable-ref swipeable-ref
+                                   :style {:left 8}})})
+         (when right-button
+           {:overshoot-right      false
+            :right-threshold      style/swipe-action-width
+            :render-right-actions (render-swipe-action
+                                   {:active-swipeable active-swipeable
+                                    :extra-fn extra-fn
+                                    :interpolation-opacity style/right-swipe-opacity-interpolation-js
+                                    :interpolation-translate-x
+                                    style/right-swipe-translate-x-interpolation-js
+                                    :on-press right-on-press
+                                    :swipe-button right-button
+                                    :swipeable-ref swipeable-ref
+                                    :style {:right -8}})}))]
+       children))))

src/status_im/contexts/shell/activity_center/notification/community_kicked/view.cljs

@@ -1,7 +1,6 @@
 (ns status-im.contexts.shell.activity-center.notification.community-kicked.view
   (:require
     [quo.core :as quo]
-    [react-native.core :as rn]
     [react-native.gesture :as gesture]
     [status-im.contexts.shell.activity-center.notification.common.style :as common-style]
     [status-im.contexts.shell.activity-center.notification.common.view :as common]
@@ -10,34 +9,33 @@
     [utils.re-frame :as rf]))
 
 (defn- swipeable
-  [{:keys [extra-fn]} child]
+  [{:keys [active-swipeable extra-fn]} child]
   [common/swipeable
-   {:left-button    common/swipe-button-read-or-unread
-    :left-on-press  common/swipe-on-press-toggle-read
-    :right-button   common/swipe-button-delete
-    :right-on-press common/swipe-on-press-delete
-    :extra-fn       extra-fn}
+   {:left-button      common/swipe-button-read-or-unread
+    :left-on-press    common/swipe-on-press-toggle-read
+    :right-button     common/swipe-button-delete
+    :right-on-press   common/swipe-on-press-delete
+    :active-swipeable active-swipeable
+    :extra-fn         extra-fn}
    child])
 
 (defn view
-  [{:keys [notification extra-fn]}]
-  (let [{:keys [id community-id read
+  [{:keys [notification set-swipeable-height customization-color] :as props}]
+  (let [{:keys [community-id read
                 timestamp]} notification
         community           (rf/sub [:communities/community community-id])
         community-name      (:name community)
-        community-image     (get-in community [:images :thumbnail :uri])
-        customization-color (rf/sub [:profile/customization-color])
-        on-press            (rn/use-callback
-                             (fn []
-                               (rf/dispatch [:navigate-back])
-                               (rf/dispatch [:activity-center.notifications/mark-as-read id]))
-                             [id])]
-    [swipeable {:extra-fn extra-fn}
-     [gesture/touchable-without-feedback {:on-press on-press}
+        community-image     (get-in community [:images :thumbnail :uri])]
+    [swipeable props
+     [gesture/touchable-without-feedback
+      {:on-press (fn []
+                   (rf/dispatch [:navigate-back])
+                   (rf/dispatch [:activity-center.notifications/mark-as-read (:id notification)]))}
       [quo/activity-log
        {:title               (i18n/label :t/community-kicked-heading)
         :customization-color customization-color
         :icon                :i/placeholder
+        :on-layout           set-swipeable-height
         :timestamp           (datetime/timestamp->relative timestamp)
         :unread?             (not read)
         :context             [[quo/text {:style common-style/user-avatar-tag-text}

src/status_im/contexts/shell/activity_center/notification/community_request/view.cljs

@@ -1,7 +1,6 @@
 (ns status-im.contexts.shell.activity-center.notification.community-request.view
   (:require
     [quo.core :as quo]
-    [react-native.core :as rn]
     [react-native.gesture :as gesture]
     [status-im.constants :as constants]
     [status-im.contexts.shell.activity-center.notification.common.style :as common-style]
@@ -11,23 +10,27 @@
     [utils.re-frame :as rf]))
 
 (defn- swipeable
-  [{:keys [extra-fn]} child]
+  [{:keys [active-swipeable extra-fn]} child]
   [common/swipeable
-   {:left-button    common/swipe-button-read-or-unread
-    :left-on-press  common/swipe-on-press-toggle-read
-    :right-button   common/swipe-button-delete
-    :right-on-press common/swipe-on-press-delete
-    :extra-fn       extra-fn}
+   {:left-button      common/swipe-button-read-or-unread
+    :left-on-press    common/swipe-on-press-toggle-read
+    :right-button     common/swipe-button-delete
+    :right-on-press   common/swipe-on-press-delete
+    :active-swipeable active-swipeable
+    :extra-fn         extra-fn}
    child])
 
 (defn- get-header-text-and-context
-  [community-logo community-name community-permissions membership-status]
-  (let [open?                 (not= 3 (:access community-permissions))
+  [community membership-status]
+  (let [community-name        (:name community)
+        permissions           (:permissions community)
+        open?                 (not= 3 (:access permissions))
+        community-image       (get-in community [:images :thumbnail :uri])
         community-context-tag [quo/context-tag
                                {:type           :community
                                 :size           24
                                 :blur?          true
-                                :community-logo community-logo
+                                :community-logo community-image
                                 :community-name community-name}]]
     (cond
       (= membership-status constants/activity-center-membership-status-idle)
@@ -53,33 +56,27 @@
                                     :t/joined-community
                                     :t/community-request-accepted-body-text)
                                   (when open? {:community community-name}))]
-                     community-context-tag]})))
+                     community-context-tag]}
+
+      :else nil)))
 
 (defn view
-  [{:keys [notification extra-fn]}]
+  [{:keys [notification set-swipeable-height customization-color] :as props}]
   (let [{:keys [community-id membership-status read
-                timestamp]}   notification
-        community-name        (rf/sub [:communities/name community-id])
-        community-logo        (rf/sub [:communities/logo community-id])
-        community-permissions (rf/sub [:communities/permissions community-id])
-        customization-color   (rf/sub [:profile/customization-color])
-        {:keys [header-text
-                context]}     (get-header-text-and-context community-logo
-                                                           community-name
-                                                           community-permissions
-                                                           membership-status)
-        on-press              (rn/use-callback
-                               (fn []
-                                 (rf/dispatch [:navigate-back])
-                                 (rf/dispatch [:communities/navigate-to-community-overview
-                                               community-id]))
-                               [community-id])]
-    [swipeable {:extra-fn extra-fn}
-     [gesture/touchable-without-feedback {:on-press on-press}
+                timestamp]}           notification
+        community                     (rf/sub [:communities/community community-id])
+        {:keys [header-text context]} (get-header-text-and-context community
+                                                                   membership-status)]
+    [swipeable props
+     [gesture/touchable-without-feedback
+      {:on-press (fn []
+                   (rf/dispatch [:navigate-back])
+                   (rf/dispatch [:communities/navigate-to-community-overview community-id]))}
       [quo/activity-log
        {:title               header-text
         :customization-color customization-color
         :icon                :i/communities
+        :on-layout           set-swipeable-height
         :timestamp           (datetime/timestamp->relative timestamp)
         :unread?             (not read)
         :context             context}]]]))

src/status_im/contexts/shell/activity_center/notification/contact_requests/view.cljs

@@ -1,7 +1,6 @@
 (ns status-im.contexts.shell.activity-center.notification.contact-requests.view
   (:require
     [quo.core :as quo]
-    quo.theme
     [react-native.core :as rn]
     [status-im.constants :as constants]
     [status-im.contexts.shell.activity-center.notification.common.style :as common-style]
@@ -25,52 +24,48 @@
     :text  (i18n/label :t/decline)}])
 
 (defn- swipeable
-  [{:keys [extra-fn notification]} child]
+  [{:keys [active-swipeable extra-fn notification]} child]
   (let [{:keys [id author message]}     notification
         {:keys [contact-request-state]} message
         {:keys [public-key]}            (rf/sub [:multiaccount/contact])
-        outgoing?                       (= public-key author)
-        accept                          (rn/use-callback
-                                         #(rf/dispatch [:activity-center.contact-requests/accept id])
-                                         [id])
-        decline                         (rn/use-callback
-                                         #(rf/dispatch [:activity-center.contact-requests/decline id])
-                                         [id])]
+        outgoing?                       (= public-key author)]
     (cond
       (or (#{constants/contact-request-message-state-accepted
              constants/contact-request-message-state-declined}
            contact-request-state)
           (and outgoing? (= contact-request-state constants/contact-request-message-state-pending)))
       [common/swipeable
-       {:left-button    common/swipe-button-read-or-unread
-        :left-on-press  common/swipe-on-press-toggle-read
-        :right-button   common/swipe-button-delete
-        :right-on-press common/swipe-on-press-delete
-        :extra-fn       extra-fn}
+       {:left-button      common/swipe-button-read-or-unread
+        :left-on-press    common/swipe-on-press-toggle-read
+        :right-button     common/swipe-button-delete
+        :right-on-press   common/swipe-on-press-delete
+        :active-swipeable active-swipeable
+        :extra-fn         extra-fn}
        child]
 
       (and (= contact-request-state constants/contact-request-message-state-pending)
            (not outgoing?))
       [common/swipeable
-       {:left-button    swipe-button-accept
-        :left-on-press  accept
-        :right-button   swipe-button-decline
-        :right-on-press decline
-        :extra-fn       extra-fn}
+       {:left-button      swipe-button-accept
+        :left-on-press    #(rf/dispatch [:activity-center.contact-requests/accept id])
+        :right-button     swipe-button-decline
+        :right-on-press   #(rf/dispatch [:activity-center.contact-requests/decline id])
+        :active-swipeable active-swipeable
+        :extra-fn         extra-fn}
        child]
 
       :else
       child)))
 
 (defn- outgoing-contact-request-view
-  [{:keys [notification]} theme]
+  [{:keys [notification set-swipeable-height customization-color]} theme]
   (let [{:keys [chat-id message last-message accepted]} notification
-        {:keys [contact-request-state] :as message}     (or message last-message)
-        customization-color                             (rf/sub [:profile/customization-color])]
+        {:keys [contact-request-state] :as message}     (or message last-message)]
     (if accepted
       [quo/activity-log
        {:title               (i18n/label :t/contact-request-was-accepted)
         :customization-color customization-color
+        :on-layout           set-swipeable-height
         :icon                :i/add-user
         :timestamp           (datetime/timestamp->relative (:timestamp notification))
         :unread?             (not (:read notification))
@@ -81,6 +76,7 @@
       [quo/activity-log
        {:title               (i18n/label :t/contact-request)
         :customization-color customization-color
+        :on-layout           set-swipeable-height
         :icon                :i/add-user
         :timestamp           (datetime/timestamp->relative (:timestamp notification))
         :unread?             (not (:read notification))
@@ -106,22 +102,13 @@
                                nil)}])))
 
 (defn- incoming-contact-request-view
-  [{:keys [notification]} theme]
-  (let [{:keys [id author message
-                last-message]} notification
-        customization-color    (rf/sub [:profile/customization-color])
-        message                (or message last-message)
-        accept                 (rn/use-callback
-                                (fn []
-                                  (rf/dispatch [:activity-center.contact-requests/accept id]))
-                                [id])
-        decline                (rn/use-callback
-                                (fn []
-                                  (rf/dispatch [:activity-center.contact-requests/decline id]))
-                                [id])]
+  [{:keys [notification set-swipeable-height customization-color]} theme]
+  (let [{:keys [id author message last-message]} notification
+        message                                  (or message last-message)]
     [quo/activity-log
      {:title (i18n/label :t/contact-request)
       :customization-color customization-color
+      :on-layout set-swipeable-height
       :icon :i/add-user
       :timestamp (datetime/timestamp->relative (:timestamp notification))
       :unread? (not (:read notification))
@@ -153,13 +140,13 @@
           :key                 :button-decline
           :label               (i18n/label :t/decline)
           :accessibility-label :decline-contact-request
-          :on-press            decline}
+          :on-press            #(rf/dispatch [:activity-center.contact-requests/decline id])}
          {:type                :button
           :subtype             :positive
           :key                 :button-accept
           :label               (i18n/label :t/accept)
           :accessibility-label :accept-contact-request
-          :on-press            accept}]
+          :on-press            #(rf/dispatch [:activity-center.contact-requests/accept id])}]
 
         nil)}]))
 
@@ -168,16 +155,16 @@
   (let [{:keys [author message last-message]} notification
         {:keys [public-key]}                  (rf/sub [:multiaccount/contact])
         {:keys [contact-request-state]}       (or message last-message)
-        theme                                 (quo.theme/use-theme)]
+        app-theme                             (rf/sub [:theme])]
     [swipeable props
      (cond
        (= public-key author)
-       [outgoing-contact-request-view props theme]
+       [outgoing-contact-request-view props app-theme]
 
        (= contact-request-state constants/contact-request-message-state-accepted)
        [rn/pressable
         {:on-press #(rf/dispatch [:chat.ui/start-chat author])}
-        [incoming-contact-request-view props theme]]
+        [incoming-contact-request-view props app-theme]]
 
        :else
-       [incoming-contact-request-view props theme])]))
+       [incoming-contact-request-view props app-theme])]))

src/status_im/contexts/shell/activity_center/notification/contact_verification/view.cljs

@@ -105,7 +105,7 @@
   (rf/dispatch [:activity-center.notifications/mark-as-read id]))
 
 (defn- swipeable
-  [{:keys [extra-fn notification replying?] :as props} child]
+  [{:keys [active-swipeable extra-fn notification replying?] :as props} child]
   (let [{:keys [id message
                 contact-verification-status]} notification
         challenger?                           (:outgoing message)]
@@ -116,21 +116,23 @@
       (and (not challenger?)
            (= contact-verification-status constants/contact-verification-status-pending))
       [common/swipeable
-       {:left-button    swipe-button-reply
-        :left-on-press  #(prepare-challenge-reply props)
-        :right-button   swipe-button-decline
-        :right-on-press #(decline-challenge id)
-        :extra-fn       extra-fn}
+       {:left-button      swipe-button-reply
+        :left-on-press    #(prepare-challenge-reply props)
+        :right-button     swipe-button-decline
+        :right-on-press   #(decline-challenge id)
+        :active-swipeable active-swipeable
+        :extra-fn         extra-fn}
        child]
 
       (and challenger?
            (= contact-verification-status constants/contact-verification-status-accepted))
       [common/swipeable
-       {:left-button    swipe-button-trust
-        :left-on-press  #(mark-challenge-trusted id)
-        :right-button   swipe-button-untrustworthy
-        :right-on-press #(mark-challenge-untrustworthy id)
-        :extra-fn       extra-fn}
+       {:left-button      swipe-button-trust
+        :left-on-press    #(mark-challenge-trusted id)
+        :right-button     swipe-button-untrustworthy
+        :right-on-press   #(mark-challenge-untrustworthy id)
+        :active-swipeable active-swipeable
+        :extra-fn         extra-fn}
        child]
 
       (#{constants/contact-verification-status-accepted
@@ -138,11 +140,12 @@
          constants/contact-verification-status-trusted}
        contact-verification-status)
       [common/swipeable
-       {:left-button    common/swipe-button-read-or-unread
-        :left-on-press  common/swipe-on-press-toggle-read
-        :right-button   common/swipe-button-delete
-        :right-on-press common/swipe-on-press-delete
-        :extra-fn       extra-fn}
+       {:left-button      common/swipe-button-read-or-unread
+        :left-on-press    common/swipe-on-press-toggle-read
+        :right-button     common/swipe-button-delete
+        :right-on-press   common/swipe-on-press-delete
+        :active-swipeable active-swipeable
+        :extra-fn         extra-fn}
        child]
 
       :else
@@ -151,9 +154,8 @@
 (defn view
   [_]
   (let [reply (atom "")]
-    (fn [{:keys [notification replying?] :as props}]
-      (let [customization-color                   (rf/sub [:profile/customization-color])
-            {:keys [id message
+    (fn [{:keys [notification set-swipeable-height replying? customization-color] :as props}]
+      (let [{:keys [id message
                     contact-verification-status]} notification
             challenger?                           (:outgoing message)]
         ;; TODO(@ilmotta): Declined challenges should only be displayed for the challengee, not the
@@ -163,84 +165,86 @@
                (= contact-verification-status constants/contact-verification-status-declined))
           [swipeable props
            [quo/activity-log
-            {:title (i18n/label :t/identity-verification-request)
-             :customization-color customization-color
-             :icon :i/friend
-             :timestamp (datetime/timestamp->relative (:timestamp notification))
-             :unread? (not (:read notification))
-             :on-update-reply #(reset! reply %)
-             :replying? replying?
-             :max-reply-length max-reply-length
-             :valid-reply? valid-reply?
-             :context (context-tags challenger? notification)
-             :message (activity-message challenger? notification)
-             :items
-             (cond-> []
-               (and challenger?
-                    (= contact-verification-status constants/contact-verification-status-accepted))
-               (concat
-                [{:type                :button
-                  :subtype             :danger
-                  :key                 :button-mark-as-untrustworthy
-                  :label               (i18n/label :t/untrustworthy)
-                  :accessibility-label :mark-contact-verification-as-untrustworthy
-                  :on-press            #(mark-challenge-untrustworthy id)}
-                 {:type                :button
-                  :subtype             :positive
-                  :key                 :button-accept
-                  :label               (i18n/label :t/accept)
-                  :accessibility-label :mark-contact-verification-as-trusted
-                  :on-press            #(mark-challenge-trusted id)}])
+            (merge
+             (when-not replying?
+               {:on-layout set-swipeable-height})
+             {:title (i18n/label :t/identity-verification-request)
+              :customization-color customization-color
+              :icon :i/friend
+              :timestamp (datetime/timestamp->relative (:timestamp notification))
+              :unread? (not (:read notification))
+              :on-update-reply #(reset! reply %)
+              :replying? replying?
+              :max-reply-length max-reply-length
+              :valid-reply? valid-reply?
+              :context (context-tags challenger? notification)
+              :message (activity-message challenger? notification)
+              :items
+              (cond-> []
+                (and challenger?
+                     (= contact-verification-status constants/contact-verification-status-accepted))
+                (concat
+                 [{:type                :button
+                   :subtype             :danger
+                   :key                 :button-mark-as-untrustworthy
+                   :label               (i18n/label :t/untrustworthy)
+                   :accessibility-label :mark-contact-verification-as-untrustworthy
+                   :on-press            #(mark-challenge-untrustworthy id)}
+                  {:type                :button
+                   :subtype             :positive
+                   :key                 :button-accept
+                   :label               (i18n/label :t/accept)
+                   :accessibility-label :mark-contact-verification-as-trusted
+                   :on-press            #(mark-challenge-trusted id)}])
 
-               (and challenger?
-                    (= contact-verification-status constants/contact-verification-status-trusted))
-               (concat [{:type    :status
-                         :subtype :positive
-                         :key     :status-trusted
-                         :label   (i18n/label :t/status-confirmed)}])
+                (and challenger?
+                     (= contact-verification-status constants/contact-verification-status-trusted))
+                (concat [{:type    :status
+                          :subtype :positive
+                          :key     :status-trusted
+                          :label   (i18n/label :t/status-confirmed)}])
 
-               (and challenger?
-                    (= contact-verification-status
-                       constants/contact-verification-status-untrustworthy))
-               (concat [{:type    :status
-                         :subtype :negative
-                         :key     :status-untrustworthy
-                         :label   (i18n/label :t/untrustworthy)}])
+                (and challenger?
+                     (= contact-verification-status constants/contact-verification-status-untrustworthy))
+                (concat [{:type    :status
+                          :subtype :negative
+                          :key     :status-untrustworthy
+                          :label   (i18n/label :t/untrustworthy)}])
 
-               (and (not challenger?)
-                    (= contact-verification-status constants/contact-verification-status-accepted))
-               (concat [{:type    :status
-                         :subtype :positive
-                         :key     :status-accepted
-                         :label   (i18n/label :t/replied)}])
+                (and (not challenger?)
+                     (= contact-verification-status constants/contact-verification-status-accepted))
+                (concat [{:type    :status
+                          :subtype :positive
+                          :key     :status-accepted
+                          :label   (i18n/label :t/replied)}])
 
-               (and (not challenger?)
-                    (= contact-verification-status constants/contact-verification-status-declined))
-               (concat [{:type    :status
-                         :subtype :negative
-                         :key     :status-declined
-                         :label   (i18n/label :t/declined)}])
+                (and (not challenger?)
+                     (= contact-verification-status constants/contact-verification-status-declined))
+                (concat [{:type    :status
+                          :subtype :negative
+                          :key     :status-declined
+                          :label   (i18n/label :t/declined)}])
 
-               (and (not challenger?)
-                    (= contact-verification-status constants/contact-verification-status-pending))
-               (concat
-                [{:type                :button
-                  :subtype             :danger
-                  :key                 :button-decline
-                  :label               (i18n/label :t/decline)
-                  :accessibility-label :decline-contact-verification
-                  :on-press            #(decline-challenge id)}
-                 (if replying?
-                   {:type                :button
-                    :subtype             :primary
-                    :key                 :button-reply
-                    :label               (i18n/label :t/send-reply)
-                    :accessibility-label :reply-to-contact-verification
-                    :disable-when        invalid-reply?
-                    :on-press            #(send-challenge-reply id @reply)}
-                   {:type                :button
-                    :subtype             :primary
-                    :key                 :button-send-reply
-                    :label               (i18n/label :t/message-reply)
-                    :accessibility-label :send-reply-to-contact-verification
-                    :on-press            #(prepare-challenge-reply props)})]))}]])))))
+                (and (not challenger?)
+                     (= contact-verification-status constants/contact-verification-status-pending))
+                (concat
+                 [{:type                :button
+                   :subtype             :danger
+                   :key                 :button-decline
+                   :label               (i18n/label :t/decline)
+                   :accessibility-label :decline-contact-verification
+                   :on-press            #(decline-challenge id)}
+                  (if replying?
+                    {:type                :button
+                     :subtype             :primary
+                     :key                 :button-reply
+                     :label               (i18n/label :t/send-reply)
+                     :accessibility-label :reply-to-contact-verification
+                     :disable-when        invalid-reply?
+                     :on-press            #(send-challenge-reply id @reply)}
+                    {:type                :button
+                     :subtype             :primary
+                     :key                 :button-send-reply
+                     :label               (i18n/label :t/message-reply)
+                     :accessibility-label :send-reply-to-contact-verification
+                     :on-press            #(prepare-challenge-reply props)})]))})]])))))

src/status_im/contexts/shell/activity_center/notification/membership/view.cljs

@@ -1,7 +1,6 @@
 (ns status-im.contexts.shell.activity-center.notification.membership.view
   (:require
     [quo.core :as quo]
-    [react-native.core :as rn]
     [react-native.gesture :as gesture]
     [status-im.contexts.shell.activity-center.notification.common.style :as common-style]
     [status-im.contexts.shell.activity-center.notification.common.view :as common]
@@ -34,50 +33,35 @@
     :text  (i18n/label :t/decline)}])
 
 (defn- swipeable
-  [{:keys [notification extra-fn]} child]
-  (let [{:keys [accepted dismissed
-                id]} notification
-        accept       (rn/use-callback
-                      (fn [] (rf/dispatch [:activity-center.notifications/accept id]))
-                      [id])
-        dismiss      (rn/use-callback
-                      (fn [] (rf/dispatch [:activity-center.notifications/dismiss id]))
-                      [id])]
+  [{:keys [active-swipeable notification extra-fn]} child]
+  (let [{:keys [accepted dismissed id]} notification]
     (if (or accepted dismissed)
       [common/swipeable
-       {:left-button    common/swipe-button-read-or-unread
-        :left-on-press  common/swipe-on-press-toggle-read
-        :right-button   common/swipe-button-delete
-        :right-on-press common/swipe-on-press-delete
-        :extra-fn       extra-fn}
+       {:left-button      common/swipe-button-read-or-unread
+        :left-on-press    common/swipe-on-press-toggle-read
+        :right-button     common/swipe-button-delete
+        :right-on-press   common/swipe-on-press-delete
+        :active-swipeable active-swipeable
+        :extra-fn         extra-fn}
        child]
       [common/swipeable
-       {:left-button    swipe-button-accept
-        :left-on-press  accept
-        :right-button   swipe-button-decline
-        :right-on-press dismiss
-        :extra-fn       extra-fn}
+       {:left-button      swipe-button-accept
+        :left-on-press    #(rf/dispatch [:activity-center.notifications/accept id])
+        :right-button     swipe-button-decline
+        :right-on-press   #(rf/dispatch [:activity-center.notifications/dismiss id])
+        :active-swipeable active-swipeable
+        :extra-fn         extra-fn}
        child])))
 
 (defn view
-  [{:keys [notification] :as props}]
-  (let [{:keys [id accepted dismissed author read
-                timestamp chat-name
-                chat-id]}   notification
-        customization-color (rf/sub [:profile/customization-color])
-        accept              (rn/use-callback
-                             (fn []
-                               (rf/dispatch [:activity-center.notifications/accept id]))
-                             [id])
-        dismiss             (rn/use-callback
-                             (fn []
-                               (rf/dispatch [:activity-center.notifications/dismiss id]))
-                             [id])]
+  [{:keys [notification set-swipeable-height customization-color] :as props}]
+  (let [{:keys [id accepted dismissed author read timestamp chat-name chat-id]} notification]
     [swipeable props
      [pressable {:accepted accepted :chat-id chat-id}
       [quo/activity-log
        {:title               (i18n/label :t/added-to-group-chat)
         :customization-color customization-color
+        :on-layout           set-swipeable-height
         :icon                :i/add-user
         :timestamp           (datetime/timestamp->relative timestamp)
         :unread?             (not read)
@@ -94,10 +78,13 @@
                                  :key                 :button-accept
                                  :label               (i18n/label :t/accept)
                                  :accessibility-label :accept-group-chat-invitation
-                                 :on-press            accept}
+                                 :on-press            #(rf/dispatch
+                                                        [:activity-center.notifications/accept id])}
                                 {:type                :button
                                  :subtype             :danger
                                  :key                 :button-decline
                                  :label               (i18n/label :t/decline)
                                  :accessibility-label :decline-group-chat-invitation
-                                 :on-press            dismiss}])}]]]))
+                                 :on-press            #(rf/dispatch
+                                                        [:activity-center.notifications/dismiss
+                                                         id])}])}]]]))

src/status_im/contexts/shell/activity_center/notification/mentions/view.cljs

@@ -30,24 +30,25 @@
                        parsed-text-children))))
 
 (defn- swipeable
-  [{:keys [extra-fn]} child]
+  [{:keys [active-swipeable extra-fn]} child]
   [common/swipeable
-   {:left-button    common/swipe-button-read-or-unread
-    :left-on-press  common/swipe-on-press-toggle-read
-    :right-button   common/swipe-button-delete
-    :right-on-press common/swipe-on-press-delete
-    :extra-fn       extra-fn}
+   {:left-button      common/swipe-button-read-or-unread
+    :left-on-press    common/swipe-on-press-toggle-read
+    :right-button     common/swipe-button-delete
+    :right-on-press   common/swipe-on-press-delete
+    :active-swipeable active-swipeable
+    :extra-fn         extra-fn}
    child])
 
 (defn view
-  [{:keys [notification extra-fn]}]
+  [{:keys [notification set-swipeable-height customization-color] :as props}]
   (let [{:keys [author chat-name community-id chat-id
                 message read timestamp]} notification
         community-chat?                  (not (string/blank? community-id))
-        community-name                   (rf/sub [:communities/name community-id])
-        community-logo                   (rf/sub [:communities/logo community-id])
-        customization-color              (rf/sub [:profile/customization-color])]
-    [swipeable {:extra-fn extra-fn}
+        community                        (rf/sub [:communities/community community-id])
+        community-name                   (:name community)
+        community-image                  (get-in community [:images :thumbnail :uri])]
+    [swipeable props
      [gesture/touchable-without-feedback
       {:on-press (fn []
                    (rf/dispatch [:hide-popover])
@@ -55,6 +56,7 @@
       [quo/activity-log
        {:title               (i18n/label :t/mention)
         :customization-color customization-color
+        :on-layout           set-swipeable-height
         :icon                :i/mention
         :timestamp           (datetime/timestamp->relative timestamp)
         :unread?             (not read)
@@ -66,7 +68,7 @@
                                  {:type           :channel
                                   :blur?          true
                                   :size           24
-                                  :community-logo community-logo
+                                  :community-logo community-image
                                   :community-name community-name
                                   :channel-name   chat-name}]
                                 [quo/context-tag

src/status_im/contexts/shell/activity_center/notification/reply/view.cljs

@@ -51,26 +51,26 @@
     nil))
 
 (defn- swipeable
-  [{:keys [extra-fn]} child]
+  [{:keys [active-swipeable extra-fn]} child]
   [common/swipeable
-   {:left-button    common/swipe-button-read-or-unread
-    :left-on-press  common/swipe-on-press-toggle-read
-    :right-button   common/swipe-button-delete
-    :right-on-press common/swipe-on-press-delete
-    :extra-fn       extra-fn}
+   {:left-button      common/swipe-button-read-or-unread
+    :left-on-press    common/swipe-on-press-toggle-read
+    :right-button     common/swipe-button-delete
+    :right-on-press   common/swipe-on-press-delete
+    :active-swipeable active-swipeable
+    :extra-fn         extra-fn}
    child])
 
 (defn view
-  [{:keys [notification extra-fn]}]
+  [{:keys [notification set-swipeable-height customization-color] :as props}]
   (let [{:keys [author chat-name community-id chat-id
-                message read timestamp
-                album-messages]} notification
-        community-chat?          (not (string/blank? community-id))
-        community-name           (rf/sub [:communities/name community-id])
-        community-logo           (rf/sub [:communities/logo community-id])
-        customization-color      (rf/sub [:profile/customization-color])
-        media-server-port        (rf/sub [:mediaserver/port])]
-    [swipeable {:extra-fn extra-fn}
+                message read timestamp album-messages]} notification
+        community-chat?                                 (not (string/blank? community-id))
+        community                                       (rf/sub [:communities/community community-id])
+        community-name                                  (:name community)
+        community-image                                 (get-in community [:images :thumbnail :uri])
+        media-server-port                               (rf/sub [:mediaserver/port])]
+    [swipeable props
      [gesture/touchable-without-feedback
       {:on-press (fn []
                    (rf/dispatch [:hide-popover])
@@ -78,6 +78,7 @@
       [quo/activity-log
        {:title               (i18n/label :t/message-reply)
         :customization-color customization-color
+        :on-layout           set-swipeable-height
         :icon                :i/reply
         :timestamp           (datetime/timestamp->relative timestamp)
         :unread?             (not read)
@@ -88,7 +89,7 @@
                                  {:type           :channel
                                   :blur?          true
                                   :size           24
-                                  :community-logo community-logo
+                                  :community-logo community-image
                                   :community-name community-name
                                   :channel-name   chat-name}]
                                 [quo/context-tag
@@ -112,7 +113,10 @@
 
                                                       (= (:content-type message)
                                                          constants/content-type-gif)
-                                                      :gif)
+                                                      :gif
+
+                                                      :else
+                                                      nil)
                               :body                 (get-message-content message
                                                                          album-messages
                                                                          media-server-port)}}]]]))

src/status_im/contexts/shell/activity_center/view.cljs

@@ -1,10 +1,9 @@
 (ns status-im.contexts.shell.activity-center.view
   (:require
+    [oops.core :as oops]
     [quo.core :as quo]
     [react-native.core :as rn]
     [react-native.navigation :as navigation]
-    [status-im.constants :as constants]
-    [status-im.contexts.shell.activity-center.context :as ac.context]
     [status-im.contexts.shell.activity-center.header.view :as header]
     [status-im.contexts.shell.activity-center.notification-types :as types]
     [status-im.contexts.shell.activity-center.notification.admin.view :as admin]
@@ -24,68 +23,61 @@
     [utils.re-frame :as rf]))
 
 (defn notification-component
-  [{:keys [type] :as notification} index]
-  (let [extra-fn (rn/use-callback
-                  (fn []
-                    {:notification notification})
-                  [notification])
-        props    {:notification notification
-                  :extra-fn     extra-fn}]
-    ;; Notifications are expensive to render. Without `delay-render` the opening
-    ;; animation of the Activity Center can be clunky and the time to open the
-    ;; AC after pressing the bell icon can be high.
-    [rn/view {:style (style/notification-container index)}
-     (cond
-       (= type types/contact-verification)
-       [contact-verification/view props]
-
-       (= type types/contact-request)
-       [contact-requests/view props]
-
-       (= type types/mention)
-       [mentions/view props]
-
-       (= type types/reply)
-       [reply/view props]
-
-       (= type types/admin)
-       [admin/view props]
-
-       (some types/membership [type])
-       (condp = type
-         types/private-group-chat [membership/view props]
-         types/community-request  [community-request/view props]
-         types/community-kicked   [community-kicked/view props]
-         nil))]))
-
-(defn- fetch-next-page
   []
-  (rf/dispatch [:activity-center.notifications/fetch-next-page]))
+  (let [height               (atom 0)
+        set-swipeable-height #(reset! height (oops/oget % "nativeEvent.layout.height"))]
+    (fn [{:keys [type] :as notification} index _ {:keys [active-swipeable customization-color]}]
+      (let [props {:height               height
+                   :customization-color  customization-color
+                   :active-swipeable     active-swipeable
+                   :set-swipeable-height set-swipeable-height
+                   :notification         notification
+                   :extra-fn             (fn [] {:height @height :notification notification})}]
+        [rn/view {:style (style/notification-container index)}
+         (cond
+           (= type types/contact-verification)
+           [contact-verification/view props]
+
+           (= type types/contact-request)
+           [contact-requests/view props]
+
+           (= type types/mention)
+           [mentions/view props]
+
+           (= type types/reply)
+           [reply/view props]
+
+           (= type types/admin)
+           [admin/view props]
+
+           (some types/membership [type])
+           (condp = type
+             types/private-group-chat [membership/view props]
+             types/community-request  [community-request/view props]
+             types/community-kicked   [community-kicked/view props]
+             nil)
+
+           :else
+           nil)]))))
 
 (defn view
   []
-  (let [notifications    (rf/sub [:activity-center/notifications])
-
-        ;; We globally control the active swipeable for all notifications
-        ;; because when a swipe left/right gesture initiates, the previously
-        ;; active swiped notification (if any) must be removed & closed with
-        ;; animation.
-        active-swipeable (rn/use-ref-atom nil)]
-    (rn/use-mount
-     (fn []
-       (rf/dispatch [:activity-center.notifications/fetch-first-page])))
-
-    [ac.context/provider {:active-swipeable active-swipeable}
-     [quo/overlay {:type :shell}
-      [rn/view {:style {:flex 1 :padding-top (navigation/status-bar-height)}}
-       [header/header]
-       (rn/delay-render
-        [rn/flat-list
-         {:data                      notifications
-          :initial-num-to-render     constants/notifications-per-page
-          :content-container-style   {:flex-grow 1}
-          :empty-component           [empty-tab/empty-tab]
-          :key-fn                    :id
-          :on-scroll-to-index-failed identity
-          :on-end-reached            fetch-next-page
-          :render-fn                 notification-component}])]]]))
+  (let [active-swipeable (atom nil)]
+    (rf/dispatch [:activity-center.notifications/fetch-first-page])
+    (fn []
+      (let [notifications       (rf/sub [:activity-center/notifications])
+            customization-color (rf/sub [:profile/customization-color])]
+        [quo/overlay {:type :shell}
+         [rn/view {:flex 1 :padding-top (navigation/status-bar-height)}
+          [header/header]
+          [rn/flat-list
+           {:data                      notifications
+            :render-data               {:active-swipeable    active-swipeable
+                                        :customization-color customization-color}
+            :content-container-style   {:flex-grow 1}
+            :empty-component           [empty-tab/empty-tab]
+            :key-fn                    :id
+            :on-scroll-to-index-failed identity
+            :on-end-reached            #(rf/dispatch [:activity-center.notifications/fetch-next-page])
+            :render-fn                 notification-component}]]
+        ]))))

src/status_im/contexts/shell/qr_reader/view.cljs

@@ -117,14 +117,13 @@
 (defn- f-internal-view
   []
   (let [{:keys [keyboard-shown]} (hooks/use-keyboard)]
-    (rn/use-mount
-     (fn []
-       (when keyboard-shown
-         (rn/dismiss-keyboard!))))
-    [scan-qr-code/view
-     {:title           (i18n/label :t/scan-qr)
-      :share-button?   true
-      :on-success-scan on-qr-code-scanned}]))
+    [:<>
+     (when keyboard-shown
+       (rn/dismiss-keyboard!))
+     [scan-qr-code/view
+      {:title           (i18n/label :t/scan-qr)
+       :share-button?   true
+       :on-success-scan on-qr-code-scanned}]]))
 
 (defn view
   []

src/status_im/contexts/syncing/scan_sync_code/view.cljs

@@ -346,8 +346,7 @@
                                               #(reset! camera-permission-granted? %)
                                               #(reset! camera-permission-granted? false)))))
         [:<>
-         [rn/view {:style style/absolute-fill}
-          background]
+         background
          (when camera-ready-to-scan?
            [render-camera
             {:torch-mode            torch-mode

src/status_im/contexts/wallet/account/tabs/dapps/style.cljs

@@ -0,0 +1,18 @@
+(ns status-im.contexts.wallet.account.tabs.dapps.style
+  (:require
+    [quo.foundations.colors :as colors]))
+
+(def dapps-container
+  {:padding-horizontal 20
+   :padding-vertical   8})
+
+(defn dapps-list
+  [theme]
+  {:border-radius 16
+   :border-width  1
+   :border-color  (colors/theme-colors colors/neutral-10 colors/neutral-80 theme)})
+
+(defn separator
+  [theme]
+  {:height           1
+   :background-color (colors/theme-colors colors/neutral-10 colors/neutral-80 theme)})

src/status_im/contexts/wallet/account/tabs/dapps/view.cljs

@@ -0,0 +1,37 @@
+(ns status-im.contexts.wallet.account.tabs.dapps.view
+  (:require
+    [quo.core :as quo]
+    [quo.theme :as quo.theme]
+    [react-native.core :as rn]
+    [status-im.common.resources :as resources]
+    [status-im.contexts.wallet.account.tabs.dapps.style :as style]
+    [status-im.contexts.wallet.common.empty-tab.view :as empty-tab]
+    [utils.i18n :as i18n]))
+
+(defn dapp-options
+  []
+  [quo/action-drawer
+   [[{:icon                :i/browser
+      :accessibility-label :visit-dapp
+      :label               (i18n/label :t/visit-dapp)}
+     {:icon                :i/disconnect
+      :accessibility-label :disconnect-dapp
+      :label               (i18n/label :t/disconnect-dapp)
+      :add-divider?        true
+      :danger?             true}]]])
+
+(defn view
+  []
+  (let [theme      (quo.theme/use-theme)
+        dapps-list []]
+    (if (empty? dapps-list)
+      [empty-tab/view
+       {:title       (i18n/label :t/no-dapps)
+        :description (i18n/label :t/no-dapps-description)
+        :image       (resources/get-themed-image :no-dapps theme)}]
+      [rn/view {:style style/dapps-container}
+       [rn/flat-list
+        {:data      dapps-list
+         :style     (style/dapps-list theme)
+         :render-fn (fn [item] [quo/dapp item])
+         :separator [rn/view {:style (style/separator theme)}]}]])))

src/status_im/contexts/wallet/account/tabs/view.cljs

@@ -3,6 +3,7 @@
     [react-native.core :as rn]
     [status-im.contexts.wallet.account.tabs.about.view :as about]
     [status-im.contexts.wallet.account.tabs.assets.view :as assets]
+    [status-im.contexts.wallet.account.tabs.dapps.view :as dapps]
     [status-im.contexts.wallet.collectible.options.view :as options-drawer]
     [status-im.contexts.wallet.common.activity-tab.view :as activity]
     [status-im.contexts.wallet.common.collectibles-tab.view :as collectibles]
@@ -44,4 +45,5 @@
                       {:title        (i18n/label :t/no-permissions)
                        :description  (i18n/label :t/no-collectibles-description)
                        :placeholder? true}]
+       :dapps        [dapps/view]
        [about/view])]))

src/status_im/contexts/wallet/account/view.cljs

@@ -13,11 +13,13 @@
 
 (def first-tab-id :assets)
 
-(def tabs-data
-  [{:id :assets :label (i18n/label :t/assets) :accessibility-label :assets-tab}
-   {:id :collectibles :label (i18n/label :t/collectibles) :accessibility-label :collectibles-tab}
-   {:id :activity :label (i18n/label :t/activity) :accessibility-label :activity-tab}
-   {:id :about :label (i18n/label :t/about) :accessibility-label :about}])
+(defn tabs-data
+  [watch-only?]
+  (cond-> [{:id :assets :label (i18n/label :t/assets) :accessibility-label :assets-tab}
+           {:id :collectibles :label (i18n/label :t/collectibles) :accessibility-label :collectibles-tab}
+           {:id :activity :label (i18n/label :t/activity) :accessibility-label :activity-tab}]
+    (not watch-only?) (conj {:id :dapps :label (i18n/label :t/dapps) :accessibility-label :dapps})
+    :always           (conj {:id :about :label (i18n/label :t/about) :accessibility-label :about})))
 
 (defn- change-tab [id] (rf/dispatch [:wallet/select-account-tab id]))
 
@@ -67,7 +69,7 @@
       {:style            style/tabs
        :size             32
        :active-tab-id    selected-tab
-       :data             tabs-data
+       :data             (tabs-data watch-only?)
        :on-change        change-tab
        :scrollable?      true
        :scroll-on-press? true}]

src/status_im/contexts/wallet/collectible/utils.cljs

@@ -28,6 +28,17 @@
       (log/debug "unsupported collectible file type:" (or collectible-type "Unknown type"))
       false)))
 
+(defn total-owned-collectible
+  ([ownership]
+   (total-owned-collectible ownership false))
+  ([ownership address]
+   (reduce (fn [acc item]
+             (if (or (not address) (= (:address item) address))
+               (+ acc (js/parseInt (:balance item)))
+               acc))
+           0
+           ownership)))
+
 (defn collectible-owned-counter
   [total]
   (when (> total 1) (str "x" total)))

src/status_im/contexts/wallet/collectible/view.cljs

@@ -160,9 +160,6 @@
             collectible-owner              (rf/sub [:wallet/collectible-details-owner collectible])
             aspect-ratio                   (rf/sub [:wallet/collectible-aspect-ratio])
             gradient-color                 (rf/sub [:wallet/collectible-gradient-color])
-            total-owned                    (rf/sub [:wallet/total-owned-collectible
-                                                    (:ownership collectible)
-                                                    (:address collectible-owner)])
             {:keys [id
                     preview-url
                     collection-data
@@ -185,7 +182,10 @@
                                             :image-height 300
                                             :id           token-id
                                             :header       collectible-name
-                                            :description  collection-name}]
+                                            :description  collection-name}
+            total-owned                    (utils/total-owned-collectible
+                                            (:ownership collectible)
+                                            (:address collectible-owner))]
         [rn/view {:style style/container}
          [rn/view
           [gradient-layer preview-uri]

src/status_im/contexts/wallet/common/collectibles_tab/view.cljs

@@ -7,8 +7,7 @@
     [status-im.contexts.wallet.collectible.utils :as utils]
     [status-im.contexts.wallet.common.collectibles-tab.style :as style]
     [status-im.contexts.wallet.common.empty-tab.view :as empty-tab]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
+    [utils.i18n :as i18n]))
 
 (defn- collectible-item
   [{:keys [preview-url collection-data collectible-data total-owned on-press on-long-press]
@@ -62,16 +61,15 @@
       ;; TODO: https://github.com/status-im/status-mobile/issues/20137
       ;; 1. If possible, move `collectibles-data` calculation to a subscription
       ;; 2. Optimization: do not recalculate all the collectibles, process only the new ones
-      (let [collectibles-data (map-indexed
-                               (fn [index {:keys [ownership] :as collectible}]
-                                 (let [total-owned (rf/sub [:wallet/total-owned-collectible ownership
-                                                            current-account-address])]
-                                   (assoc collectible
-                                          :total-owned       total-owned
-                                          :on-long-press     on-collectible-long-press
-                                          :on-press          on-collectible-press
-                                          :collectible-index index)))
-                               collectibles)]
+      (let [collectibles-data (map-indexed (fn [index {:keys [ownership] :as collectible}]
+                                             (assoc collectible
+                                                    :total-owned       (utils/total-owned-collectible
+                                                                        ownership
+                                                                        current-account-address)
+                                                    :on-long-press     on-collectible-long-press
+                                                    :on-press          on-collectible-press
+                                                    :collectible-index index))
+                                           collectibles)]
         [rn/flat-list
          {:data                     collectibles-data
           :style                    {:flex 1}

src/status_im/contexts/wallet/common/token_value/view.cljs

@@ -16,14 +16,14 @@
    :right-icon          :i/external})
 
 (defn- action-send
-  [send-params entry-point]
+  [send-params]
   {:icon                :i/send
    :accessibility-label :send
    :label               (i18n/label :t/send)
    :on-press            (fn []
                           (rf/dispatch [:hide-bottom-sheet])
                           (rf/dispatch [:wallet/clean-send-data])
-                          (rf/dispatch [:wallet/set-token-to-send send-params entry-point]))})
+                          (rf/dispatch [:wallet/set-token-to-send send-params]))})
 
 (defn- action-receive
   [selected-account?]
@@ -66,41 +66,36 @@
    :on-press            #(js/alert "to be implemented")})
 
 (defn token-value-drawer
-  [token watch-only? entry-point]
+  [token watch-only?]
   (let [token-symbol          (:token token)
         token-data            (first (rf/sub [:wallet/current-viewing-account-tokens-filtered
                                               token-symbol]))
         selected-account?     (rf/sub [:wallet/current-viewing-account-address])
-        token-owners          (rf/sub [:wallet/operable-addresses-with-token-symbol token-symbol])
         send-or-bridge-params (if selected-account?
                                 {:token       token-data
                                  :stack-id    :screen/wallet.accounts
-                                 :start-flow? true
-                                 :owners      token-owners}
+                                 :start-flow? true}
                                 {:token-symbol token-symbol
                                  :stack-id     :wallet-stack
-                                 :start-flow?  true
-                                 :owners       token-owners})]
+                                 :start-flow?  true})]
     [quo/action-drawer
      [(cond->> [(when (ff/enabled? ::ff/wallet.assets-modal-manage-tokens)
                   (action-manage-tokens watch-only?))
                 (when (ff/enabled? ::ff/wallet.assets-modal-hide)
                   (action-hide))]
         (not watch-only?) (concat [(action-buy)
-                                   (when (seq token-owners)
-                                     (action-send send-or-bridge-params entry-point))
+                                   (action-send send-or-bridge-params)
                                    (action-receive selected-account?)
                                    (when (ff/enabled? ::ff/wallet.swap) (action-swap))
-                                   (when (seq (seq token-owners))
-                                     (action-bridge send-or-bridge-params))]))]]))
+                                   (action-bridge send-or-bridge-params)]))]]))
 
 (defn view
-  [item _ _ {:keys [watch-only? entry-point]}]
+  [item _ _ {:keys [watch-only?]}]
   [quo/token-value
    (cond-> item
      (or (not watch-only?) (ff/enabled? ::ff/wallet.long-press-watch-only-asset))
      (assoc :on-long-press
             #(rf/dispatch
               [:show-bottom-sheet
-               {:content       (fn [] [token-value-drawer item watch-only? entry-point])
+               {:content       (fn [] [token-value-drawer item watch-only?])
                 :selected-item (fn [] [quo/token-value item])}])))])

src/status_im/contexts/wallet/common/utils.cljs

@@ -307,14 +307,10 @@
                                                     :color           color
                                                     :currency        currency
                                                     :currency-symbol currency-symbol}))
-        calculated-tokens (map calculate-token tokens)]
+        calculated-tokens (map calculate-token tokens)
+        token-priority    {"SNT" 1 "STT" 1 "ETH" 2 "DAI" 3}]
     (sort-by (fn [token]
                (let [fiat-value (get-in token [:values :fiat-unformatted-value])
-                     priority   (get constants/token-sort-priority (:token token) ##Inf)]
+                     priority   (get token-priority (:token token) 999)]
                  [(- fiat-value) priority]))
              calculated-tokens)))
-
-(defn sort-tokens
-  [tokens]
-  (let [priority #(get constants/token-sort-priority (:symbol %) ##Inf)]
-    (sort-by (juxt (comp - :balance) priority) tokens)))

src/status_im/contexts/wallet/common/utils/networks.cljs

@@ -172,20 +172,17 @@
 
 (defn get-network-details
   [chain-id]
-  (as-> chain-id $
-    (condp contains? $
-      #{constants/ethereum-mainnet-chain-id constants/ethereum-goerli-chain-id
-        constants/ethereum-sepolia-chain-id}
-      mainnet-network-details
+  (condp contains? chain-id
+    #{constants/ethereum-mainnet-chain-id constants/ethereum-goerli-chain-id
+      constants/ethereum-sepolia-chain-id}
+    mainnet-network-details
 
-      #{constants/arbitrum-mainnet-chain-id constants/arbitrum-goerli-chain-id
-        constants/arbitrum-sepolia-chain-id}
-      arbitrum-network-details
+    #{constants/arbitrum-mainnet-chain-id constants/arbitrum-goerli-chain-id
+      constants/arbitrum-sepolia-chain-id}
+    arbitrum-network-details
 
-      #{constants/optimism-mainnet-chain-id constants/optimism-goerli-chain-id
-        constants/optimism-sepolia-chain-id}
-      optimism-network-details
+    #{constants/optimism-mainnet-chain-id constants/optimism-goerli-chain-id
+      constants/optimism-sepolia-chain-id}
+    optimism-network-details
 
-      nil)
-    (when $
-      (assoc $ :chain-id chain-id))))
+    nil))

src/status_im/contexts/wallet/common/utils_test.cljs

@@ -149,14 +149,5 @@
                 expected-order ["DAI" "ETH" "SNT"]]
             (is (= expected-order sorted-tokens))))))))
 
-(deftest sort-tokens-test
-  (testing "sort-tokens function"
-    (let [mock-tokens    [{:symbol "ETH" :balance 5}
-                          {:symbol "DAI" :balance 10}
-                          {:symbol "SNT" :balance 1}]
-          sorted-tokens  (map :symbol (utils/sort-tokens mock-tokens))
-          expected-order ["DAI" "ETH" "SNT"]]
-      (is (= expected-order sorted-tokens)))))
-
 
 

src/status_im/contexts/wallet/connected_dapps/view.cljs

@@ -9,10 +9,8 @@
     [status-im.common.resources :as resources]
     [status-im.contexts.wallet.connected-dapps.disconnect-dapp.view :as disconnect-dapp]
     [status-im.contexts.wallet.connected-dapps.style :as style]
-    [status-im.contexts.wallet.wallet-connect.core :as core]
     [utils.i18n :as i18n]
-    [utils.re-frame :as rf]
-    [utils.string]))
+    [utils.re-frame :as rf]))
 
 (defn- on-disconnect
   [wallet-account {:keys [name topic]}]
@@ -21,6 +19,7 @@
    [:wallet-connect/disconnect-dapp
     {:topic      topic
      :on-success (fn []
+                   (rf/dispatch [:wallet-connect/remove-pairing-by-topic topic])
                    (rf/dispatch [:toasts/upsert
                                  {:id   :dapp-disconnect-success
                                   :type :positive
@@ -84,17 +83,15 @@
   []
   (let [{:keys [bottom]}                   (safe-area/get-insets)
         {:keys [color] :as wallet-account} (rf/sub [:wallet/current-viewing-account])
-        sessions                           (rf/sub
-                                            [:wallet-connect/sessions-for-current-account])
-        theme                              (quo.theme/use-theme)
-        customization-color                (rf/sub [:profile/customization-color])]
+        pairings                           (rf/sub [:wallet-connect/pairings])
+        theme                              (quo.theme/use-theme)]
     [rn/view {:flex 1}
      [header
       {:title          (i18n/label :t/connected-dapps)
        :wallet-account wallet-account
        :on-close       #(rf/dispatch [:navigate-back])
        :on-add         #(rf/dispatch [:navigate-to :screen/wallet.scan-dapp])}]
-     (if (empty? sessions)
+     (if (empty? pairings)
        [quo/empty-state
         {:title           (i18n/label :t/no-dapps)
          :description     (i18n/label :t/no-dapps-description)
@@ -102,18 +99,16 @@
          :container-style style/empty-container-style}]
        [rn/view (style/dapps-container bottom)
         [rn/flat-list
-         {:data                    sessions
+         {:data                    pairings
           :always-bounce-vertical  false
           :content-container-style (style/dapps-list theme)
-          :render-fn               (fn [{:keys [topic pairingTopic name url iconUrl]}]
+          :render-fn               (fn [{:keys                    [topic]
+                                         {:keys [icons name url]} :peerMetadata}]
                                      [quo/dapp
-                                      {:dapp                {:avatar (core/compute-dapp-icon-path iconUrl
-                                                                                                  url)
-                                                             :name (core/compute-dapp-name name url)
-                                                             :value url
-                                                             :topic topic
-                                                             :pairing-topic pairingTopic
-                                                             :customization-color customization-color}
+                                      {:dapp                {:avatar (get icons 0)
+                                                             :name   name
+                                                             :value  url
+                                                             :topic  topic}
                                        :accessibility-label (str "dapp-" topic)
                                        :state               :default
                                        :action              :icon

src/status_im/contexts/wallet/events.cljs

@@ -65,21 +65,10 @@
    {:db (assoc-in db [:wallet :current-viewing-account-address] address)}))
 
 (rf/reg-event-fx :wallet/clean-current-viewing-account
- (fn [{:keys [db]} [ignore-just-completed-transaction?]]
-   (let [{:keys [entry-point just-completed-transaction?]} (-> db :wallet :ui :send)
-         entry-point-wallet-home?                          (= entry-point :wallet-stack)]
-     {:db (cond-> db
-            (and (not entry-point)
-                 (not ignore-just-completed-transaction?)
-                 (not just-completed-transaction?))
-            (update :wallet dissoc :current-viewing-account-address)
-
-            entry-point-wallet-home?
-            (update-in [:wallet :ui :send] dissoc :entry-point)
-
-            (and entry-point-wallet-home?
-                 (not just-completed-transaction?))
-            (update :wallet dissoc :current-viewing-account-address))})))
+ (fn [{:keys [db]}]
+   (let [just-completed-transaction? (get-in db [:wallet :ui :send :just-completed-transaction?])]
+     (when-not just-completed-transaction?
+       {:db (update db :wallet dissoc :current-viewing-account-address)}))))
 
 (rf/reg-event-fx :wallet/close-account-page
  (fn [{:keys [db]}]

src/status_im/contexts/wallet/home/tabs/assets/view.cljs

@@ -18,5 +18,4 @@
       [rn/flat-list
        {:render-fn               token-value/view
         :data                    tokens
-        :render-data             {:entry-point :wallet-stack}
         :content-container-style style/list-container}])))

src/status_im/contexts/wallet/home/tabs/view.cljs

@@ -21,7 +21,7 @@
 
 (defn view
   [{:keys [selected-tab]}]
-  (let [collectible-list     (rf/sub [:wallet/owned-collectibles-list-in-selected-networks])
+  (let [collectible-list     (rf/sub [:wallet/all-collectibles-list-in-selected-networks])
         request-collectibles #(rf/dispatch
                                [:wallet/request-collectibles-for-all-accounts {}])]
     [rn/view {:style style/container}

src/status_im/contexts/wallet/send/events.cljs

@@ -187,41 +187,38 @@
 (rf/reg-event-fx
  :wallet/update-receiver-networks
  (fn [{:keys [db]} [selected-networks]]
-   (let [amount (get-in db [:wallet :ui :send :amount])]
-     {:db (assoc-in db [:wallet :ui :send :receiver-networks] selected-networks)
+   (let [amount                           (get-in db [:wallet :ui :send :amount])
+         disabled-from-chain-ids          (get-in db [:wallet :ui :send :disabled-from-chain-ids])
+         filtered-disabled-from-chain-ids (filter (fn [chain-id]
+                                                    (some #(= chain-id %)
+                                                          selected-networks))
+                                                  disabled-from-chain-ids)]
+     {:db (-> db
+              (assoc-in [:wallet :ui :send :receiver-networks] selected-networks)
+              (assoc-in [:wallet :ui :send :disabled-from-chain-ids] filtered-disabled-from-chain-ids))
       :fx [[:dispatch [:wallet/get-suggested-routes {:amount amount}]]]})))
 
 (rf/reg-event-fx
  :wallet/set-token-to-send
- (fn [{:keys [db]} [{:keys [token-symbol token stack-id start-flow? owners]} entry-point]]
+ (fn [{:keys [db]} [{:keys [token-symbol token stack-id start-flow?]}]]
    ;; `token` is a map extracted from the sender, but in the wallet home page we don't know the
    ;; sender yet, so we only provide the `token-symbol`, later in
    ;; `:wallet/select-from-account` the `token` key will be set.
-   (let [{:keys [networks]}  token
-         receiver-networks   (get-in db [:wallet :ui :send :receiver-networks])
-         token-networks-ids  (map :chain-id networks)
-         unsupported-token?  (not-any? (set receiver-networks) token-networks-ids)
-         unique-owner        (when (= (count owners) 1)
-                               (first owners))
-         unique-owner-tokens (get-in db [:wallet :accounts unique-owner :tokens])
-         token-data          (or token
-                                 (when (and token-symbol unique-owner)
-                                   (some #(when (= (:symbol %) token-symbol) %)
-                                         unique-owner-tokens)))]
-     (when (or token-data token-symbol)
+   (let [{token-networks :networks}                token
+         receiver-networks                         (get-in db [:wallet :ui :send :receiver-networks])
+         token-networks-ids                        (mapv #(:chain-id %) token-networks)
+         token-not-supported-in-receiver-networks? (not-any? (set receiver-networks)
+                                                             token-networks-ids)]
+     (when (or token token-symbol)
        {:db (cond-> db
-              :always      (update-in [:wallet :ui :send]
-                                      #(-> %
-                                           (dissoc :collectible)
-                                           (assoc :token-not-supported-in-receiver-networks?
-                                                  unsupported-token?)))
-              token-symbol (assoc-in [:wallet :ui :send :token-symbol] token-symbol)
-              token-data   (update-in [:wallet :ui :send]
-                                      #(assoc %
-                                              :token              token-data
-                                              :token-display-name (:symbol token-data)))
-              unique-owner (assoc-in [:wallet :current-viewing-account-address] unique-owner)
-              entry-point  (assoc-in [:wallet :ui :send :entry-point] entry-point))
+              :always      (update-in [:wallet :ui :send] dissoc :collectible)
+              :always      (assoc-in
+                            [:wallet :ui :send :token-not-supported-in-receiver-networks?]
+                            token-not-supported-in-receiver-networks?)
+              token        (assoc-in [:wallet :ui :send :token] token)
+              token        (assoc-in [:wallet :ui :send :token-display-name]
+                            (:symbol token))
+              token-symbol (assoc-in [:wallet :ui :send :token-symbol] token-symbol))
         :fx [[:dispatch [:wallet/clean-suggested-routes]]
              [:dispatch
               [:wallet/wizard-navigate-forward
@@ -235,9 +232,9 @@
    (let [{token-networks :networks
           token-symbol   :symbol}                  token
          receiver-networks                         (get-in db [:wallet :ui :send :receiver-networks])
-         token-networks-ids                        (map :chain-id token-networks)
-         token-not-supported-in-receiver-networks? (not-any? (set receiver-networks)
-                                                             token-networks-ids)]
+         token-networks-ids                        (mapv #(:chain-id %) token-networks)
+         token-not-supported-in-receiver-networks? (not (some (set receiver-networks)
+                                                              token-networks-ids))]
      {:db (-> db
               (assoc-in [:wallet :ui :send :token] token)
               (assoc-in [:wallet :ui :send :token-display-name] token-symbol)
@@ -266,9 +263,7 @@
 (rf/reg-event-fx
  :wallet/set-collectible-to-send
  (fn [{db :db} [{:keys [collectible current-screen start-flow?]}]]
-   (let [viewing-account?   (some? (-> db :wallet :current-viewing-account-address))
-         entry-point        (when-not viewing-account? :wallet-stack)
-         collection-data    (:collection-data collectible)
+   (let [collection-data    (:collection-data collectible)
          collectible-data   (:collectible-data collectible)
          contract-type      (:contract-type collectible)
          tx-type            (if (= contract-type constants/wallet-contract-type-erc-1155)
@@ -283,7 +278,6 @@
 
                               collectible
                               (str (:name collection-data) " #" collectible-id))
-         owner-address      (-> collectible :ownership first :address)
          collectible-tx     (-> db
                                 (update-in [:wallet :ui :send] dissoc :token)
                                 (assoc-in [:wallet :ui :send :collectible] collectible)
@@ -291,14 +285,7 @@
                                 (assoc-in [:wallet :ui :send :tx-type] tx-type))
          recipient-set?     (-> db :wallet :ui :send :recipient)]
      {:db (cond-> collectible-tx
-            :always
-            (assoc-in [:wallet :ui :send :entry-point] entry-point)
-
-            (not viewing-account?)
-            (assoc-in [:wallet :current-viewing-account-address] owner-address)
-
-            one-collectible?
-            (assoc-in [:wallet :ui :send :amount] 1))
+            one-collectible? (assoc-in [:wallet :ui :send :amount] 1))
       :fx [(when (and one-collectible? recipient-set?)
              [:dispatch [:wallet/get-suggested-routes {:amount 1}]])
            [:dispatch

src/status_im/contexts/wallet/send/events_test.cljs

@@ -23,6 +23,19 @@
           selected-networks-after  [:ethereum :optimism]
           expected-db              {:wallet {:ui {:send {:receiver-networks selected-networks-after}}}}]
       (reset! rf-db/app-db {:wallet {:ui {:send {:receiver-networks selected-networks-before}}}})
+      (is (match? expected-db (:db (dispatch [event-id selected-networks-after]))))))
+
+  (testing "if receiver network removed, it is also removed from disabled ones"
+    (let [selected-networks-before       [:ethereum :optimism :arbitrum]
+          selected-networks-after        [:ethereum :optimism]
+          disabled-from-chain-ids-before [:optimism :arbitrum]
+          disabled-from-chain-ids-after  [:optimism]
+          expected-db                    {:wallet {:ui {:send {:receiver-networks selected-networks-after
+                                                               :disabled-from-chain-ids
+                                                               disabled-from-chain-ids-after}}}}]
+      (reset! rf-db/app-db {:wallet {:ui {:send {:receiver-networks selected-networks-before
+                                                 :disabled-from-chain-ids
+                                                 disabled-from-chain-ids-before}}}})
       (is (match? expected-db (:db (dispatch [event-id selected-networks-after])))))))
 
 (h/deftest-event :wallet/set-token-to-send

src/status_im/contexts/wallet/send/from/view.cljs

@@ -42,6 +42,7 @@
                                  {:on-press      #(rf/dispatch [:navigate-back])
                                   :margin-top    (safe-area/get-top)
                                   :switcher-type :select-account}]}
+
      [quo/page-top
       {:title                     (i18n/label :t/from-label)
        :title-accessibility-label :title-label}]

src/status_im/contexts/wallet/send/input_amount/view.cljs

@@ -120,7 +120,7 @@
   []
   [quo/alert-banner
    {:action?         true
-    :text            (i18n/label :t/not-enough-assets-to-pay-gas-fees)
+    :text            (i18n/label :t/not-enough-assets)
     :button-text     (i18n/label :t/buy-eth)
     :on-button-press #(rf/dispatch [:show-bottom-sheet
                                     {:content buy-token/view}])}])

src/status_im/contexts/wallet/send/select_address/view.cljs

@@ -177,9 +177,7 @@
                          (rf/dispatch [:wallet/clean-selected-collectible])
                          (rf/dispatch [:wallet/clean-send-address])
                          (rf/dispatch [:wallet/clean-disabled-from-networks])
-                         (rf/dispatch [:wallet/select-address-tab nil])
-                         (rf/dispatch [:wallet/clean-current-viewing-account
-                                       :ignore-just-complete-transaction]))
+                         (rf/dispatch [:wallet/select-address-tab nil]))
         on-change-tab  #(rf/dispatch [:wallet/select-address-tab %])
         input-value    (reagent/atom "")
         input-focused? (reagent/atom false)]

src/status_im/contexts/wallet/sheets/select_account/view.cljs

@@ -20,7 +20,7 @@
 (defn view
   []
   (let [selected-account-address (rf/sub [:wallet/current-viewing-account-address])
-        accounts                 (rf/sub [:wallet/operable-accounts])]
+        accounts                 (rf/sub [:wallet/operable-accounts-without-watched-accounts])]
     [:<>
      [quo/drawer-top {:title (i18n/label :t/select-account)}]
      [gesture/flat-list

src/status_im/contexts/wallet/swap/set_spending_cap/style.cljs

@@ -1,40 +0,0 @@
-(ns status-im.contexts.wallet.swap.set-spending-cap.style
-  (:require [quo.foundations.colors :as colors]))
-
-(def container
-  {:flex       1
-   :margin-top -20})
-
-(def detail-item
-  {:flex             1
-   :height           36
-   :background-color :transparent})
-
-(def content-container
-  {:padding-top        12
-   :padding-horizontal 20
-   :padding-bottom     32})
-
-(def title-container
-  {:margin-horizontal 4})
-
-(def title-line-with-margin-top
-  {:flex-direction :row
-   :margin-top     4})
-
-(def details-container
-  {:flex-direction     :row
-   :justify-content    :space-between
-   :height             52
-   :padding-top        7
-   :padding-horizontal 1
-   :margin-bottom      8})
-
-(def summary-section-container
-  {:padding-horizontal 20
-   :padding-bottom     16})
-
-(defn section-label
-  [theme]
-  {:margin-bottom 8
-   :color         (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)})

src/status_im/contexts/wallet/swap/set_spending_cap/view.cljs

@@ -1,253 +0,0 @@
-(ns status-im.contexts.wallet.swap.set-spending-cap.view
-  (:require
-    [quo.core :as quo]
-    [quo.foundations.resources :as resources]
-    [quo.theme :as quo.theme]
-    [react-native.core :as rn]
-    [status-im.common.floating-button-page.view :as floating-button-page]
-    [status-im.common.standard-authentication.core :as standard-auth]
-    [status-im.contexts.wallet.common.utils.external-links :as external-links]
-    [status-im.contexts.wallet.swap.set-spending-cap.style :as style]
-    [utils.address :as address-utils]
-    [utils.i18n :as i18n]
-    [utils.navigation :as navigation]
-    [utils.re-frame :as rf]))
-
-(defn- swap-title
-  [{:keys [pay-token-symbol pay-amount account provider]}]
-  [rn/view {:style style/content-container}
-   [rn/view {:style {:flex-direction :row}}
-    [quo/text
-     {:size                :heading-1
-      :weight              :semi-bold
-      :style               style/title-container
-      :accessibility-label :set-spending-cap-of}
-     (i18n/label :t/set-spending-cap-of)]]
-   [rn/view {:style style/title-line-with-margin-top}
-    [quo/summary-tag
-     {:token pay-token-symbol
-      :label (str pay-amount " " pay-token-symbol)
-      :type  :token}]
-    [quo/text
-     {:size                :heading-1
-      :weight              :semi-bold
-      :style               style/title-container
-      :accessibility-label :for}
-     (i18n/label :t/for)]]
-   [rn/view {:style style/title-line-with-margin-top}
-    [quo/summary-tag
-     {:label               (:full-name provider)
-      :type                :network
-      :image-source        (resources/get-network (:name provider))
-      :customization-color (:color provider)}]
-    [quo/text
-     {:size                :heading-1
-      :weight              :semi-bold
-      :style               style/title-container
-      :accessibility-label :on}
-     (i18n/label :t/on)]]
-   [rn/view {:style style/title-line-with-margin-top}
-    [quo/summary-tag
-     {:label               (:name account)
-      :type                :account
-      :emoji               (:emoji account)
-      :customization-color (:color account)}]]])
-
-(defn- spending-cap-section
-  [{:keys [theme amount token-symbol]}]
-  [rn/view {:style style/summary-section-container}
-   [quo/text
-    {:size                :paragraph-2
-     :weight              :medium
-     :style               (style/section-label theme)
-     :accessibility-label :spending-cap-label}
-    (i18n/label :t/spending-cap)]
-   [quo/approval-info
-    {:type            :spending-cap
-     :unlimited-icon? false
-     :label           (str amount " " token-symbol)
-     :avatar-props    {:token token-symbol}}]])
-
-(defn- account-section
-  [{:keys [theme account pay-token-symbol pay-token-amount]}]
-  [rn/view {:style style/summary-section-container}
-   [quo/text
-    {:size                :paragraph-2
-     :weight              :medium
-     :style               (style/section-label theme)
-     :accessibility-label :account-label}
-    (i18n/label :t/account)]
-   [quo/approval-info
-    {:type            :account
-     :unlimited-icon? false
-     :label           (:name account)
-     :description     (address-utils/get-short-wallet-address (:address account))
-     :tag-label       (str pay-token-amount " " pay-token-symbol)
-     :avatar-props    {:emoji               (:emoji account)
-                       :customization-color (:color account)}}]])
-
-(defn- on-option-press
-  [{:keys [chain-id contract-address]}]
-  (rf/dispatch
-   [:show-bottom-sheet
-    {:content (fn []
-                [quo/action-drawer
-                 [[{:icon                :i/link
-                    :accessibility-label :view-on-etherscan
-                    :on-press            (fn []
-                                           (rf/dispatch
-                                            [:wallet/navigate-to-chain-explorer-from-bottom-sheet
-                                             (external-links/get-explorer-url-by-chain-id chain-id)
-                                             contract-address]))
-                    :label               (i18n/label :t/view-on-eth)
-                    :right-icon          :i/external}]]])}]))
-
-(defn- token-section
-  [{:keys [theme token-address token-symbol network-chain-id]}]
-  [rn/view {:style style/summary-section-container}
-   [quo/text
-    {:size                :paragraph-2
-     :weight              :medium
-     :style               (style/section-label theme)
-     :accessibility-label :token-label}
-    (i18n/label :t/token)]
-   [quo/approval-info
-    {:type            :token-contract
-     :option-icon     :i/options
-     :on-option-press #(on-option-press {:chain-id         network-chain-id
-                                         :contract-address token-address})
-     :unlimited-icon? false
-     :label           token-symbol
-     :description     (address-utils/get-short-wallet-address token-address)
-     :avatar-props    {:token token-symbol}}]])
-
-(defn- spender-contract-section
-  [{:keys [theme provider network-chain-id]}]
-  [rn/view {:style style/summary-section-container}
-   [quo/text
-    {:size                :paragraph-2
-     :weight              :medium
-     :style               (style/section-label theme)
-     :accessibility-label :spender-contract-label}
-    (i18n/label :t/spender-contract)]
-   [quo/approval-info
-    {:type            :token-contract
-     :option-icon     :i/options
-     :on-option-press #(on-option-press {:chain-id         network-chain-id
-                                         :contract-address (:contract-address provider)})
-     :unlimited-icon? false
-     :label           (:full-name provider)
-     :description     (address-utils/get-short-wallet-address (:contract-address provider))
-     :avatar-props    {:image (resources/get-network (:name provider))}}]])
-
-(defn- data-item
-  [{:keys [network-image title subtitle size loading?]}]
-  [quo/data-item
-   {:container-style style/detail-item
-    :blur?           false
-    :card?           false
-    :network-image   network-image
-    :subtitle-type   (if network-image :network :default)
-    :status          (if loading? :loading :default)
-    :title           title
-    :subtitle        subtitle
-    :size            size}])
-
-(defn- transaction-details
-  [{:keys [estimated-time-min max-fees network loading-fees?]}]
-  [rn/view {:style style/details-container}
-   [:<>
-    [data-item
-     {:title         (i18n/label :t/network)
-      :subtitle      (:full-name network)
-      :network-image (:source network)}]
-    [data-item
-     {:title    (i18n/label :t/est-time)
-      :subtitle (i18n/label :t/time-in-mins {:minutes (str estimated-time-min)})}]
-    [data-item
-     {:title    (i18n/label :t/max-fees)
-      :subtitle max-fees
-      :loading? loading-fees?
-      :size     :small}]]])
-
-(defn footer
-  [{:keys [estimated-time-min native-currency-symbol network theme account-color loading-fees?]}]
-  (let [native-token    (when native-currency-symbol
-                          (rf/sub [:wallet/token-by-symbol
-                                   native-currency-symbol]))
-        fee-formatted   (rf/sub [:wallet/wallet-send-fee-fiat-formatted
-                                 native-token])
-        on-auth-success (rn/use-callback #(js/alert "Not implemented yet"))]
-    [rn/view {:style {:margin-bottom -10}}
-     [transaction-details
-      {:estimated-time-min estimated-time-min
-       :max-fees           fee-formatted
-       :network            network
-       :loading-fees?      loading-fees?
-       :theme              theme}]
-     [standard-auth/slide-button
-      {:size                :size-48
-       :track-text          (i18n/label :t/slide-to-swap)
-       :container-style     {:z-index 2}
-       :customization-color account-color
-       :disabled?           loading-fees?
-       :on-auth-success     on-auth-success
-       :auth-button-label   (i18n/label :t/confirm)}]]))
-
-(defn view
-  []
-  (let [theme                   (quo.theme/use-theme)
-        swap-transaction-data   (rf/sub [:wallet/swap])
-        {:keys [asset-to-pay network pay-amount
-                providers swap-proposal
-                loading-fees?]} swap-transaction-data
-        estimated-time-min      (:estimated-time swap-proposal)
-        pay-token-symbol        (:symbol asset-to-pay)
-        pay-token-address       (:address asset-to-pay)
-        native-currency-symbol  (get-in swap-proposal [:from :native-currency-symbol])
-        account                 (rf/sub [:wallet/current-viewing-account])
-        account-color           (:color account)
-        provider                (first providers)]
-    [rn/view {:style style/container}
-     [floating-button-page/view
-      {:footer-container-padding 0
-       :header                   [quo/page-nav
-                                  {:icon-name           :i/close
-                                   :on-press            navigation/navigate-back
-                                   :margin-top          8
-                                   :background          :blur
-                                   :accessibility-label :top-bar}]
-       :footer                   [footer
-                                  {:estimated-time-min     estimated-time-min
-                                   :native-currency-symbol native-currency-symbol
-                                   :network                network
-                                   :account-color          account-color
-                                   :provider               provider
-                                   :loading-fees?          loading-fees?
-                                   :theme                  theme}]
-       :gradient-cover?          true
-       :customization-color      account-color}
-      [:<>
-       [swap-title
-        {:pay-token-symbol pay-token-symbol
-         :pay-amount       pay-amount
-         :account          account
-         :provider         provider}]
-       [spending-cap-section
-        {:token-symbol pay-token-symbol
-         :amount       pay-amount
-         :theme        theme}]
-       [account-section
-        {:account          account
-         :pay-token-symbol pay-token-symbol
-         :pay-token-amount pay-amount
-         :theme            theme}]
-       [token-section
-        {:token-symbol     pay-token-symbol
-         :token-address    pay-token-address
-         :network-chain-id (:chain-id network)
-         :theme            theme}]
-       [spender-contract-section
-        {:provider         provider
-         :network-chain-id (:chain-id network)
-         :theme            theme}]]]]))

src/status_im/contexts/wallet/swap/swap_proposal/view.cljs

@@ -16,7 +16,4 @@
      [quo/button
       {:on-press #(rf/dispatch [:navigate-to-within-stack
                                 [:screen/wallet.swap-confirmation :screen/wallet.swap-propasal]])}
-      "Swap confirmation"]
-     [quo/button
-      {:on-press #(rf/dispatch [:open-modal :screen/wallet.swap-set-spending-cap])}
-      "Set spending cap"]]))
+      "Swap confirmation"]]))

src/status_im/contexts/wallet/wallet_connect/core.cljs

@@ -4,7 +4,6 @@
             [native-module.core :as native-module]
             [status-im.constants :as constants]
             [utils.security.core :as security]
-            [utils.string]
             [utils.transforms :as transforms]))
 
 (def method-to-screen
@@ -86,81 +85,12 @@
 
 (defn required-networks-supported?
   [proposal supported-networks]
-  (let [supported-namespaces #{:eip155}
-        required-namespaces  (get-in proposal [:params :requiredNamespaces])]
-    (when (every? #(contains? supported-namespaces %)
-                  (keys required-namespaces))
-      (let [required-networks (get-in required-namespaces [:eip155 :chains])
-            supported-eip155  (set (map chain-id->eip155 supported-networks))]
-        (every? #(contains? supported-eip155 %)
-                required-networks)))))
+  (let [required-networks (get-in proposal [:params :requiredNamespaces :eip155 :chains])
+        supported-eip155  (set (map chain-id->eip155 supported-networks))]
+    (every? #(contains? supported-eip155 %) required-networks)))
 
 (defn get-networks-by-mode
   [db]
   (let [test-mode? (get-in db [:profile/profile :test-networks-enabled?])
         networks   (get-in db [:wallet :networks (if test-mode? :test :prod)])]
     (mapv #(-> % :chain-id) networks)))
-
-(defn add-full-testnet-name
-  "Updates the `:full-name` key with the full testnet name if using testnet `:chain-id`.\n
-  e.g. `{:full-name \"Mainnet\"}` -> `{:full-name \"Mainnet Sepolia\"`}`"
-  [network]
-  (let [add-testnet-name (fn [testnet-name]
-                           (update network :full-name #(str % " " testnet-name)))]
-    (condp #(contains? %1 %2) (:chain-id network)
-      constants/sepolia-chain-ids (add-testnet-name constants/sepolia-full-name)
-      constants/goerli-chain-ids  (add-testnet-name constants/goerli-full-name)
-      network)))
-
-(defn event-should-be-handled?
-  [db {:keys [topic]}]
-  (some #(= topic %)
-        (map :topic (:wallet-connect/sessions db))))
-
-(defn sdk-session->db-session
-  [{:keys [topic expiry pairingTopic] :as session}]
-  {:topic        topic
-   :expiry       expiry
-   :sessionJson  (transforms/clj->json session)
-   :pairingTopic pairingTopic
-   :name         (get-in session [:peer :metadata :name])
-   :iconUrl      (get-in session [:peer :metadata :icons 0])
-   :url          (get-in session [:peer :metadata :url])
-   :accounts     (get-in session [:namespaces :eip155 :accounts])
-   :disconnected false})
-
-(defn filter-operable-accounts
-  [accounts]
-  (filter #(and (:operable? %)
-                (not (:watch-only? %)))
-          accounts))
-
-(defn filter-sessions-for-account-addresses
-  [account-addresses sessions]
-  (filter (fn [{:keys [accounts]}]
-            (some (fn [account]
-                    (some (fn [account-address]
-                            (clojure.string/includes? account account-address))
-                          account-addresses))
-                  accounts))
-          sessions))
-
-(defn compute-dapp-name
-  "Sometimes dapps have no name or an empty name. Return url as name in that case"
-  [name url]
-  (if (seq name)
-    name
-    (when (seq url)
-      (-> url
-          utils.string/remove-trailing-slash
-          utils.string/remove-http-prefix
-          string/capitalize))))
-
-(defn compute-dapp-icon-path
-  "Some dapps have icons with relative paths, make paths absolute in those cases, send nil if icon is missing"
-  [icon-path url]
-  (when (and (seq icon-path)
-             (seq url))
-    (if (string/starts-with? icon-path "http")
-      icon-path
-      (str (utils.string/remove-trailing-slash url) icon-path))))

src/status_im/contexts/wallet/wallet_connect/effects.cljs

@@ -31,6 +31,13 @@
      :event       wc-event
      :handler     handler})))
 
+(rf/reg-fx
+ :effects.wallet-connect/fetch-pairings
+ (fn [{:keys [web3-wallet on-success on-fail]}]
+   (-> (wallet-connect/get-pairings web3-wallet)
+       (promesa/then on-success)
+       (promesa/catch on-fail))))
+
 (rf/reg-fx
  :effects.wallet-connect/pair
  (fn [{:keys [web3-wallet url on-success on-fail]}]
@@ -41,10 +48,15 @@
 
 (rf/reg-fx
  :effects.wallet-connect/disconnect
- (fn [{:keys [web3-wallet topic reason on-success on-fail]}]
-   (-> (wallet-connect/disconnect-session {:web3-wallet web3-wallet
-                                           :topic       topic
-                                           :reason      reason})
+ (fn [{:keys [web3-wallet topic on-success on-fail]}]
+   (-> (wallet-connect/core-pairing-disconnnect web3-wallet topic)
+       (promesa/then on-success)
+       (promesa/catch on-fail))))
+
+(rf/reg-fx
+ :effects.wallet-connect/fetch-active-sessions
+ (fn [{:keys [web3-wallet on-success on-fail]}]
+   (-> (wallet-connect/get-active-sessions web3-wallet)
        (promesa/then on-success)
        (promesa/catch on-fail))))
 
@@ -62,13 +74,6 @@
          (promesa/then on-success)
          (promesa/catch on-fail)))))
 
-(rf/reg-fx
- :effects.wallet-connect/fetch-active-sessions
- (fn [{:keys [web3-wallet on-success on-fail]}]
-   (-> (wallet-connect/get-active-sessions web3-wallet)
-       (promesa/then on-success)
-       (promesa/catch on-fail))))
-
 (rf/reg-fx
  :effects.wallet-connect/sign-message
  (fn [{:keys [password address data rpc-method on-success on-error]}]
@@ -85,33 +90,22 @@
          (promesa/then on-success)
          (promesa/catch on-error)))))
 
-(rf/reg-fx
- :effects.wallet-connect/prepare-transaction
- (fn [{:keys [tx chain-id on-success on-error]}]
-   (-> (transactions/prepare-transaction tx
-                                         chain-id
-                                         transactions/default-tx-priority)
-       (promesa/then on-success)
-       (promesa/catch on-error))))
-
 (rf/reg-fx
  :effects.wallet-connect/sign-transaction
- (fn [{:keys [password address chain-id tx-hash tx-args on-success on-error]}]
+ (fn [{:keys [password address chain-id tx on-success on-error]}]
    (-> (transactions/sign-transaction (security/safe-unmask-data password)
                                       address
-                                      tx-hash
-                                      tx-args
+                                      tx
                                       chain-id)
        (promesa/then on-success)
        (promesa/catch on-error))))
 
 (rf/reg-fx
  :effects.wallet-connect/send-transaction
- (fn [{:keys [password address chain-id tx-hash tx-args on-success on-error]}]
+ (fn [{:keys [password address chain-id tx on-success on-error]}]
    (-> (transactions/send-transaction (security/safe-unmask-data password)
                                       address
-                                      tx-hash
-                                      tx-args
+                                      tx
                                       chain-id)
        (promesa/then on-success)
        (promesa/catch on-error))))

src/status_im/contexts/wallet/wallet_connect/events.cljs

@@ -8,8 +8,7 @@
             status-im.contexts.wallet.wallet-connect.responding-events
             [status-im.contexts.wallet.wallet-connect.utils :as wc-utils]
             [taoensso.timbre :as log]
-            [utils.i18n :as i18n]
-            [utils.transforms :as types]))
+            [utils.i18n :as i18n]))
 
 (rf/reg-event-fx
  :wallet-connect/init
@@ -23,7 +22,12 @@
  (fn [{:keys [db]} [web3-wallet]]
    {:db (assoc db :wallet-connect/web3-wallet web3-wallet)
     :fx [[:dispatch [:wallet-connect/register-event-listeners]]
-         [:dispatch [:wallet-connect/fetch-persisted-sessions]]]}))
+         [:effects.wallet-connect/fetch-pairings
+          {:web3-wallet web3-wallet
+           :on-fail     #(log/error "Failed to get dApp pairings" {:error %})
+           :on-success  (fn [data]
+                          (rf/dispatch [:wallet-connect/set-pairings
+                                        (js->clj data :keywordize-keys true)]))}]]}))
 
 (rf/reg-event-fx
  :wallet-connect/register-event-listeners
@@ -36,11 +40,7 @@
            [:effects.wallet-connect/register-event-listener
             [web3-wallet
              constants/wallet-connect-session-request-event
-             #(rf/dispatch [:wallet-connect/on-session-request %])]]
-           [:effects.wallet-connect/register-event-listener
-            [web3-wallet
-             constants/wallet-connect-session-delete-event
-             #(rf/dispatch [:wallet-connect/on-session-delete %])]]]})))
+             #(rf/dispatch [:wallet-connect/on-session-request %])]]]})))
 
 (rf/reg-event-fx
  :wallet-connect/on-init-fail
@@ -54,22 +54,20 @@
  (fn [{:keys [db]} [proposal]]
    (log/info "Received Wallet Connect session proposal: " {:id (:id proposal)})
    (let [accounts                     (get-in db [:wallet :accounts])
-         current-viewing-address      (get-in db [:wallet :current-viewing-account-address])
-         available-accounts           (wallet-connect-core/filter-operable-accounts (vals accounts))
+         without-watched              (remove :watch-only? (vals accounts))
          networks                     (wallet-connect-core/get-networks-by-mode db)
          session-networks             (wallet-connect-core/proposal-networks-intersection proposal
                                                                                           networks)
          required-networks-supported? (wallet-connect-core/required-networks-supported? proposal
                                                                                         networks)]
-     (if (and (not-empty session-networks) required-networks-supported?)
+     (if required-networks-supported?
        {:db (update db
                     :wallet-connect/current-proposal assoc
                     :request                         proposal
                     :session-networks                session-networks
-                    :address                         (or current-viewing-address
-                                                         (-> available-accounts
-                                                             first
-                                                             :address)))
+                    :address                         (-> without-watched
+                                                         first
+                                                         :address))
         :fx [[:dispatch
               [:open-modal :screen/wallet.wallet-connect-session-proposal]]]}
        {:fx [[:dispatch
@@ -87,16 +85,9 @@
 
 (rf/reg-event-fx
  :wallet-connect/on-session-request
- (fn [{:keys [db]} [event]]
-   (when (wallet-connect-core/event-should-be-handled? db event)
-     {:fx [[:dispatch [:wallet-connect/process-session-request event]]]})))
-
-(rf/reg-event-fx
- :wallet-connect/on-session-delete
- (fn [{:keys [db]} [{:keys [topic] :as event}]]
-   (when (wallet-connect-core/event-should-be-handled? db event)
-     (log/info "Received Wallet Connect session delete: " event)
-     {:fx [[:dispatch [:wallet-connect/disconnect-session topic]]]})))
+ (fn [_ [event]]
+   (log/info "Received Wallet Connect session request: " event)
+   {:fx [[:dispatch [:wallet-connect/process-session-request event]]]}))
 
 (rf/reg-event-fx
  :wallet-connect/reset-current-session-proposal
@@ -113,6 +104,19 @@
  (fn [{:keys [db]}]
    {:db (dissoc db :wallet-connect/current-request)}))
 
+(rf/reg-event-fx
+ :wallet-connect/set-pairings
+ (fn [{:keys [db]} [pairings]]
+   {:db (assoc db :wallet-connect/pairings pairings)}))
+
+(rf/reg-event-fx
+ :wallet-connect/remove-pairing-by-topic
+ (fn [{:keys [db]} [topic]]
+   {:db (update db
+                :wallet-connect/pairings
+                (fn [pairings]
+                  (remove #(= (:topic %) topic) pairings)))}))
+
 (rf/reg-event-fx
  :wallet-connect/disconnect-dapp
  (fn [{:keys [db]} [{:keys [topic on-success on-fail]}]]
@@ -120,13 +124,8 @@
      {:fx [[:effects.wallet-connect/disconnect
             {:web3-wallet web3-wallet
              :topic       topic
-             :reason      (wallet-connect/get-sdk-error
-                           constants/wallet-connect-user-disconnected-reason-key)
              :on-fail     on-fail
-             :on-success  (fn []
-                            (rf/dispatch [:wallet-connect/disconnect-session topic])
-                            (when on-success
-                              (on-success)))}]]})))
+             :on-success  on-success}]]})))
 
 (rf/reg-event-fx
  :wallet-connect/pair
@@ -138,6 +137,15 @@
              :on-fail     #(log/error "Failed to pair with dApp" {:error %})
              :on-success  #(log/info "dApp paired successfully")}]]})))
 
+(rf/reg-event-fx
+ :wallet-connect/fetch-active-sessions
+ (fn [{:keys [db]}]
+   (let [web3-wallet (get db :wallet-connect/web3-wallet)]
+     {:fx [[:effects.wallet-connect/fetch-active-sessions
+            {:web3-wallet web3-wallet
+             :on-fail     #(log/error "Failed to get active sessions" {:error %})
+             :on-success  #(log/info "Got active sessions successfully" {:sessions %})}]]})))
+
 (rf/reg-event-fx
  :wallet-connect/approve-session
  (fn [{:keys [db]}]
@@ -196,63 +204,10 @@
                                          {:version version}))}]]]}
        {:fx [[:dispatch [:wallet-connect/pair scanned-text]]]}))))
 
-;; We first load sessions from database, then we initiate a call to Wallet Connect SDK and
-;; then replace the list we have stored in the database with the one that came from the SDK.
-;; In addition to that, we also update the backend state by marking sessions that are not
-;; active anymore by calling `:wallet-connect/disconnect-session`.
-(rf/reg-event-fx
- :wallet-connect/fetch-active-sessions-success
- (fn [{:keys [db now]} [sessions]]
-   (let [persisted-sessions (:wallet-connect/sessions db)
-         account-addresses  (->> (get-in db [:wallet :accounts])
-                                 vals
-                                 wallet-connect-core/filter-operable-accounts
-                                 (map :address))
-         sessions           (->> (js->clj sessions :keywordize-keys true)
-                                 vals
-                                 (map wallet-connect-core/sdk-session->db-session)
-                                 (wallet-connect-core/filter-sessions-for-account-addresses
-                                  account-addresses))
-         session-topics     (set (map :topic sessions))
-         expired-sessions   (filter
-                             (fn [{:keys [expiry topic]}]
-                               (or (< expiry (/ now 1000))
-                                   (not (contains? session-topics topic))))
-                             persisted-sessions)]
-     {:fx (mapv (fn [{:keys [topic]}]
-                  [:dispatch [:wallet-connect/disconnect-session topic]])
-                expired-sessions)
-      :db (assoc db :wallet-connect/sessions sessions)})))
-
-(rf/reg-event-fx
- :wallet-connect/fetch-active-sessions
- (fn [{:keys [db]}]
-   (let [web3-wallet (get db :wallet-connect/web3-wallet)]
-     {:fx [[:effects.wallet-connect/fetch-active-sessions
-            {:web3-wallet web3-wallet
-             :on-fail     #(log/error "Failed to get active sessions" {:error %})
-             :on-success  #(rf/dispatch [:wallet-connect/fetch-active-sessions-success %])}]]})))
-
 (rf/reg-event-fx
  :wallet-connect/fetch-persisted-sessions-success
  (fn [{:keys [db]} [sessions]]
-   (let [sessions' (mapv (fn [{:keys [sessionJson] :as session}]
-                           (assoc session
-                                  :accounts
-                                  (-> sessionJson
-                                      types/json->clj
-                                      :namespaces
-                                      :eip155
-                                      :accounts)))
-                         sessions)]
-     {:fx [[:dispatch [:wallet-connect/fetch-active-sessions]]]
-      :db (assoc db :wallet-connect/sessions sessions')})))
-
-(rf/reg-event-fx
- :wallet-connect/fetch-persisted-sessions-fail
- (fn [_ [error]]
-   (log/info "Wallet Connect fetch persisted sessions failed" error)
-   {:fx [[:dispatch [:wallet-connect/fetch-active-sessions]]]}))
+   {:db (assoc db :wallet-connect/persisted-sessions sessions)}))
 
 (rf/reg-event-fx
  :wallet-connect/fetch-persisted-sessions
@@ -263,7 +218,7 @@
             ;; 0 means, return everything
             :params     [0]
             :on-success [:wallet-connect/fetch-persisted-sessions-success]
-            :on-error   [:wallet-connect/fetch-persisted-sessions-fail]}]]]}))
+            :on-error   #(log/info "Wallet Connect fetch persisted sessions failed" %)}]]]}))
 
 (rf/reg-event-fx
  :wallet-connect/persist-session
@@ -271,22 +226,5 @@
    {:fx [[:json-rpc/call
           [{:method     "wallet_addWalletConnectSession"
             :params     [(js/JSON.stringify session-info)]
-            :on-success (fn []
-                          (log/info "Wallet Connect session persisted")
-                          (rf/dispatch [:wallet-connect/fetch-persisted-sessions]))
-            :on-error   #(log/info "Wallet Connect session persistence failed" %)}]]]}))
-
-(rf/reg-event-fx
- :wallet-connect/disconnect-session
- (fn [{:keys [db]} [topic]]
-   {:db (update db
-                :wallet-connect/sessions
-                (fn [sessions]
-                  (->> sessions
-                       (remove #(= (:topic %) topic))
-                       (into []))))
-    :fx [[:json-rpc/call
-          [{:method     "wallet_disconnectWalletConnectSession"
-            :params     [topic]
-            :on-success #(log/info "Wallet Connect session disconnected")
+            :on-success #(log/info "Wallet Connect session persisted")
             :on-error   #(log/info "Wallet Connect session persistence failed" %)}]]]}))

src/status_im/contexts/wallet/wallet_connect/modals/common/fees_data_item/view.cljs

@@ -1,31 +0,0 @@
-(ns status-im.contexts.wallet.wallet-connect.modals.common.fees-data-item.view
-  (:require [quo.core :as quo]
-            [quo.foundations.colors :as colors]
-            [quo.theme]
-            [status-im.contexts.wallet.wallet-connect.modals.common.style :as style]
-            [utils.i18n :as i18n]))
-
-(defn- fees-subtitle
-  [{:keys [text error?]}]
-  (let [theme (quo.theme/use-theme)]
-    [quo/text
-     {:weight :medium
-      :size   :paragraph-2
-      :style  {:color (if error?
-                        (colors/resolve-color :danger theme)
-                        (colors/theme-colors colors/neutral-100
-                                             colors/white
-                                             theme))}}
-     text]))
-
-(defn view
-  [{:keys [fees fees-error]}]
-  [quo/data-item
-   {:size            :small
-    :status          :default
-    :card?           false
-    :container-style style/data-item
-    :title           (i18n/label :t/max-fees)
-    :custom-subtitle (fn [] [fees-subtitle
-                             {:text   (or fees (i18n/label :t/no-fees))
-                              :error? (= fees-error :not-enough-assets-to-pay-gas-fees)}])}])

src/status_im/contexts/wallet/wallet_connect/modals/common/footer/view.cljs

@@ -1,7 +1,6 @@
 (ns status-im.contexts.wallet.wallet-connect.modals.common.footer.view
   (:require [quo.core :as quo]
             [quo.foundations.colors :as colors]
-            [quo.theme]
             [react-native.core :as rn]
             [status-im.common.standard-authentication.core :as standard-authentication]
             [status-im.contexts.wallet.wallet-connect.modals.common.footer.style :as style]
@@ -14,9 +13,8 @@
   (rf/dispatch [:wallet-connect/respond-current-session password]))
 
 (defn view
-  [{:keys [warning-label slide-button-text disabled?]} & children]
-  (let [{:keys [customization-color]} (rf/sub [:wallet-connect/current-request-account-details])
-        theme                         (quo.theme/use-theme)]
+  [{:keys [warning-label slide-button-text disabed?]} & children]
+  (let [{:keys [customization-color]} (rf/sub [:wallet-connect/current-request-account-details])]
     [rn/view {:style style/content-container}
      (into [rn/view
             {:style style/data-items-container}]
@@ -25,15 +23,13 @@
       [standard-authentication/slide-button
        {:size                :size-48
         :track-text          slide-button-text
-        :disabled?           disabled?
+        :disabled?           disabed?
         :customization-color customization-color
         :on-auth-success     on-auth-success
         :auth-button-label   (i18n/label :t/confirm)}]]
      [rn/view {:style style/warning-container}
       [quo/text
        {:size   :paragraph-2
-        :style  {:color (if (= theme :dark)
-                          colors/white-opa-70
-                          colors/neutral-80-opa-70)}
+        :style  {:color colors/neutral-80-opa-70}
         :weight :medium}
        warning-label]]]))

src/status_im/contexts/wallet/wallet_connect/modals/common/header/view.cljs

@@ -1,10 +1,7 @@
 (ns status-im.contexts.wallet.wallet-connect.modals.common.header.view
-  (:require
-    [quo.core :as quo]
-    [react-native.core :as rn]
-    [status-im.contexts.wallet.wallet-connect.core :as core]
-    [status-im.contexts.wallet.wallet-connect.modals.common.header.style :as style]
-    [utils.string]))
+  (:require [quo.core :as quo]
+            [react-native.core :as rn]
+            [status-im.contexts.wallet.wallet-connect.modals.common.header.style :as style]))
 
 (defn view
   [{:keys [label dapp account]}]
@@ -13,13 +10,12 @@
    [quo/text
     {:size   :heading-1
      :weight :semi-bold}
-    (let [{:keys [name iconUrl url]} dapp
-          image-source               (core/compute-dapp-icon-path iconUrl url)]
+    (let [{:keys [name icons]} (:peerMetadata dapp)]
       [rn/view {:style style/header-dapp-name}
        [quo/summary-tag
         {:type         :dapp
          :label        name
-         :image-source image-source}]])
+         :image-source (first icons)}]])
     (str " " label " ")
     (let [{:keys [emoji customization-color name]} account]
       [rn/view {:style style/header-account-name}

src/status_im/contexts/wallet/wallet_connect/modals/send_transaction/view.cljs

@@ -1,11 +1,8 @@
 (ns status-im.contexts.wallet.wallet-connect.modals.send-transaction.view
   (:require [quo.core :as quo]
-            [quo.theme]
             [react-native.core :as rn]
             [react-native.safe-area :as safe-area]
             [status-im.contexts.wallet.wallet-connect.modals.common.data-block.view :as data-block]
-            [status-im.contexts.wallet.wallet-connect.modals.common.fees-data-item.view :as
-             fees-data-item]
             [status-im.contexts.wallet.wallet-connect.modals.common.footer.view :as footer]
             [status-im.contexts.wallet.wallet-connect.modals.common.header.view :as header]
             [status-im.contexts.wallet.wallet-connect.modals.common.page-nav.view :as page-nav]
@@ -22,6 +19,7 @@
         network               (rf/sub [:wallet-connect/current-request-network])
         {:keys [max-fees-fiat-formatted
                 error-state]} (rf/sub [:wallet-connect/current-request-transaction-information])]
+    (rn/use-unmount #(rf/dispatch [:wallet-connect/reject-session-request]))
     [rn/view {:style (style/container bottom)}
      [quo/gradient-cover {:customization-color customization-color}]
      [page-nav/view
@@ -43,7 +41,7 @@
                                  :not-enough-assets
                                  :t/not-enough-assets))}])
       [footer/view
-       {:warning-label     (i18n/label :t/wallet-connect-sign-warning)
+       {:warning-label     (i18n/label :t/wallet-connect-send-transaction-warning)
         :slide-button-text (i18n/label :t/slide-to-send)
         :disabled?         error-state}
        [quo/data-item
@@ -54,7 +52,11 @@
          :subtitle-type   :network
          :network-image   (:source network)
          :subtitle        (:full-name network)}]
-       [fees-data-item/view
-        {:fees       max-fees-fiat-formatted
-         :fees-error error-state}]]]]))
+       [quo/data-item
+        {:size            :small
+         :status          :default
+         :card?           false
+         :container-style style/data-item
+         :title           (i18n/label :t/max-fees)
+         :subtitle        (or max-fees-fiat-formatted (i18n/label :t/no-fees))}]]]]))
 

src/status_im/contexts/wallet/wallet_connect/modals/sign_message/view.cljs

@@ -3,8 +3,6 @@
             [react-native.core :as rn]
             [react-native.safe-area :as safe-area]
             [status-im.contexts.wallet.wallet-connect.modals.common.data-block.view :as data-block]
-            [status-im.contexts.wallet.wallet-connect.modals.common.fees-data-item.view :as
-             fees-data-item]
             [status-im.contexts.wallet.wallet-connect.modals.common.footer.view :as footer]
             [status-im.contexts.wallet.wallet-connect.modals.common.header.view :as header]
             [status-im.contexts.wallet.wallet-connect.modals.common.page-nav.view :as page-nav]
@@ -30,7 +28,13 @@
          :account account}]
        [data-block/view]]
       [footer/view
-       {:warning-label     (i18n/label :t/wallet-connect-sign-warning)
+       {:warning-label     (i18n/label :t/wallet-connect-sign-message-warning)
         :slide-button-text (i18n/label :t/slide-to-sign)}
-       [fees-data-item/view]]]]))
+       [quo/data-item
+        {:size            :small
+         :status          :default
+         :card?           false
+         :container-style style/data-item
+         :title           (i18n/label :t/max-fees)
+         :subtitle        (i18n/label :t/no-fees)}]]]]))
 

src/status_im/contexts/wallet/wallet_connect/modals/sign_transaction/view.cljs

@@ -3,8 +3,6 @@
             [react-native.core :as rn]
             [react-native.safe-area :as safe-area]
             [status-im.contexts.wallet.wallet-connect.modals.common.data-block.view :as data-block]
-            [status-im.contexts.wallet.wallet-connect.modals.common.fees-data-item.view :as
-             fees-data-item]
             [status-im.contexts.wallet.wallet-connect.modals.common.footer.view :as footer]
             [status-im.contexts.wallet.wallet-connect.modals.common.header.view :as header]
             [status-im.contexts.wallet.wallet-connect.modals.common.page-nav.view :as page-nav]
@@ -42,7 +40,7 @@
                                  :not-enough-assets
                                  :t/not-enough-assets))}])
       [footer/view
-       {:warning-label     (i18n/label :t/wallet-connect-sign-warning)
+       {:warning-label     (i18n/label :t/wallet-connect-sign-transaction-warning)
         :slide-button-text (i18n/label :t/slide-to-sign)
         :disabled?         error-state}
        [quo/data-item
@@ -53,7 +51,11 @@
          :subtitle-type   :network
          :network-image   (:source network)
          :subtitle        (:full-name network)}]
-       [fees-data-item/view
-        {:fees       max-fees-fiat-formatted
-         :fees-error error-state}]]]]))
+       [quo/data-item
+        {:size            :small
+         :status          :default
+         :card?           false
+         :container-style style/data-item
+         :title           (i18n/label :t/max-fees)
+         :subtitle        (or max-fees-fiat-formatted (i18n/label :t/no-fees))}]]]]))
 

src/status_im/contexts/wallet/wallet_connect/processing_events.cljs

@@ -1,32 +1,19 @@
 (ns status-im.contexts.wallet.wallet-connect.processing-events
-  (:require [cljs-bean.core :as bean]
-            [clojure.string :as string]
+  (:require [clojure.string :as string]
             [native-module.core :as native-module]
             [re-frame.core :as rf]
             [status-im.constants :as constants]
             [status-im.contexts.wallet.wallet-connect.core :as wallet-connect-core]
-            [status-im.contexts.wallet.wallet-connect.transactions :as transactions]
             [taoensso.timbre :as log]
             [utils.transforms :as transforms]))
 
-(rf/reg-event-fx
- :wallet-connect/show-request-modal
- (fn [{:keys [db]}]
-   (let [event  (get-in db [:wallet-connect/current-request :event])
-         method (wallet-connect-core/get-request-method event)
-         screen (wallet-connect-core/method-to-screen method)]
-     (if screen
-       {:fx [[:dispatch [:open-modal screen]]]}
-       (log/error "Didn't find screen for Wallet Connect method"
-                  {:method method
-                   :event  :wallet-connect/process-session-request})))))
 (rf/reg-event-fx
  :wallet-connect/process-session-request
  (fn [{:keys [db]} [event]]
-   (let [method         (wallet-connect-core/get-request-method event)
-         existing-event (get-in db [:wallet-connect/current-request :event])]
-     ;; NOTE: make sure we don't show two requests at the same time
-     (when-not existing-event
+   (let [method                (wallet-connect-core/get-request-method event)
+         screen                (wallet-connect-core/method-to-screen method)
+         current-request-event (get-in db [:wallet-connect/current-request :event])]
+     (if (and screen (not current-request-event))
        {:db (assoc-in db [:wallet-connect/current-request :event] event)
         :fx [(condp = method
                constants/wallet-connect-eth-send-transaction-method
@@ -45,7 +32,12 @@
                [:dispatch [:wallet-connect/process-sign-typed]]
 
                constants/wallet-connect-personal-sign-method
-               [:dispatch [:wallet-connect/process-personal-sign]])]}))))
+               [:dispatch [:wallet-connect/process-personal-sign]])
+
+             [:dispatch [:open-modal screen]]]}
+       (log/error "Didn't find screen for Wallet Connect method"
+                  {:method method
+                   :event  :wallet-connect/process-session-request})))))
 
 (rf/reg-event-fx
  :wallet-connect/process-personal-sign
@@ -57,8 +49,7 @@
                      assoc
                      :address      (string/lower-case address)
                      :raw-data     raw-data
-                     :display-data (or parsed-data raw-data))
-      :fx [[:dispatch [:wallet-connect/show-request-modal]]]})))
+                     :display-data (or parsed-data raw-data))})))
 
 (rf/reg-event-fx
  :wallet-connect/process-eth-sign
@@ -70,53 +61,44 @@
                      assoc
                      :address      (string/lower-case address)
                      :raw-data     raw-data
-                     :display-data (or parsed-data raw-data))
-      :fx [[:dispatch [:wallet-connect/show-request-modal]]]})))
-
-(rf/reg-event-fx
- :wallet-connect/prepare-transaction-success
- (fn [{:keys [db]} [prepared-tx chain-id]]
-   (let [{:keys [tx-args]} prepared-tx
-         tx                (bean/->clj tx-args)
-         address           (-> tx :from string/lower-case)
-         display-data      (transactions/beautify-transaction tx)]
-     {:db (update-in db
-                     [:wallet-connect/current-request]
-                     assoc
-                     :address      address
-                     :raw-data     prepared-tx
-                     :transaction  tx
-                     :chain-id     chain-id
-                     :display-data display-data)
-      :fx [[:dispatch [:wallet-connect/show-request-modal]]]})))
+                     :display-data (or parsed-data raw-data))})))
 
 (rf/reg-event-fx
  :wallet-connect/process-eth-send-transaction
  (fn [{:keys [db]}]
-   (let [event    (wallet-connect-core/get-db-current-request-event db)
-         tx       (-> event wallet-connect-core/get-request-params first)
-         chain-id (-> event
-                      (get-in [:params :chainId])
-                      wallet-connect-core/eip155->chain-id)]
-     {:fx [[:effects.wallet-connect/prepare-transaction
-            {:tx         tx
-             :chain-id   chain-id
-             :on-success #(rf/dispatch [:wallet-connect/prepare-transaction-success % chain-id])
-             :on-error   #(rf/dispatch [:wallet-connect/on-processing-error %])}]]})))
+   (let [event                 (wallet-connect-core/get-db-current-request-event db)
+         display-data          (-> event
+                                   clj->js
+                                   (js/JSON.stringify nil 2))
+
+         {:keys [from] :as tx} (-> event wallet-connect-core/get-request-params first)
+         chain-id              (-> event
+                                   (get-in [:params :chainId])
+                                   wallet-connect-core/eip155->chain-id)]
+     {:db (update-in db
+                     [:wallet-connect/current-request]
+                     assoc
+                     :address      (string/lower-case from)
+                     :raw-data     tx
+                     :chain-id     chain-id
+                     :display-data display-data)})))
 
 (rf/reg-event-fx
  :wallet-connect/process-eth-sign-transaction
  (fn [{:keys [db]}]
-   (let [event    (wallet-connect-core/get-db-current-request-event db)
-         tx       (-> event wallet-connect-core/get-request-params first)
-         chain-id (-> event
-                      (get-in [:params :chainId])
-                      wallet-connect-core/eip155->chain-id)]
-     {:fx [[:effects.wallet-connect/prepare-transaction
-            {:tx         tx
-             :chain-id   chain-id
-             :on-success #(rf/dispatch [:wallet-connect/prepare-transaction-success % chain-id])
-             :on-error   #(rf/dispatch [:wallet-connect/on-processing-error %])}]]})))
+   (let [event                 (wallet-connect-core/get-db-current-request-event db)
+         display-data          (.stringify js/JSON (clj->js event) nil 2)
+         {:keys [from] :as tx} (-> event wallet-connect-core/get-request-params first)
+         chain-id              (-> event
+                                   (get-in [:params :chainId])
+                                   wallet-connect-core/eip155->chain-id)]
+     {:db (update-in db
+                     [:wallet-connect/current-request]
+                     assoc
+                     :address      (string/lower-case from)
+                     :raw-data     tx
+                     :chain-id     chain-id
+                     :display-data display-data)})))
 
 (rf/reg-event-fx
  :wallet-connect/process-sign-typed
@@ -127,31 +109,11 @@
                                      (transforms/js-dissoc :types :primaryType)
                                      (transforms/js-stringify 2))
                                  (catch js/Error _ nil))]
-     (if (nil? parsed-data)
-       {:fx [[:dispatch
-              [:wallet-connect/on-processing-error
-               (ex-info "Failed to parse JSON typed data" {:data raw-data})]]]}
-       {:db (update-in db
-                       [:wallet-connect/current-request]
-                       assoc
-                       :address      (string/lower-case address)
-                       :display-data (or parsed-data raw-data)
-                       :raw-data     raw-data)
-        :fx [[:dispatch [:wallet-connect/show-request-modal]]]}))))
-
-;; TODO: we should reject a request if processing fails
-(rf/reg-event-fx
- :wallet-connect/on-processing-error
- (fn [{:keys [db]} [error]]
-   (let [{:keys [address event]} (get db :wallet-connect/current-request)
-         method                  (wallet-connect-core/get-request-method event)
-         screen                  (wallet-connect-core/method-to-screen method)]
-     (log/error "Failed to process Wallet Connect request"
-                {:error                error
-                 :address              address
-                 :method               method
-                 :wallet-connect-event event
-                 :event                :wallet-connect/on-processing-error})
-
-     {:fx [[:dispatch [:dismiss-modal screen]]
-           [:dispatch [:wallet-connect/reset-current-request]]]})))
+     ;; TODO: decide if we should proceed if the typed-data is invalid JSON or fail ahead of time
+     (when (nil? parsed-data) (log/error "Invalid typed data"))
+     {:db (update-in db
+                     [:wallet-connect/current-request]
+                     assoc
+                     :address      (string/lower-case address)
+                     :display-data (or parsed-data raw-data)
+                     :raw-data     raw-data)})))

src/status_im/contexts/wallet/wallet_connect/responding_events.cljs

@@ -58,38 +58,34 @@
 (rf/reg-event-fx
  :wallet-connect/respond-send-transaction-data
  (fn [{:keys [db]} [password]]
-   (let [{:keys [chain-id raw-data address]} (get db :wallet-connect/current-request)
-         {:keys [tx-hash tx-args]}           raw-data]
+   (let [{:keys [chain-id raw-data address]} (get db :wallet-connect/current-request)]
      {:fx [[:effects.wallet-connect/send-transaction
             {:password   password
              :address    address
              :chain-id   chain-id
-             :tx-hash    tx-hash
-             :tx-args    tx-args
+             :tx         raw-data
              :on-error   #(rf/dispatch [:wallet-connect/on-sign-error %])
              :on-success #(rf/dispatch [:wallet-connect/send-response {:result %}])}]]})))
 
 (rf/reg-event-fx
  :wallet-connect/respond-sign-transaction-data
  (fn [{:keys [db]} [password]]
-   (let [{:keys [chain-id raw-data address]} (get db :wallet-connect/current-request)
-         {:keys [tx-hash tx-args]}           raw-data]
+   (let [{:keys [chain-id raw-data address]} (get db :wallet-connect/current-request)]
      {:fx [[:effects.wallet-connect/sign-transaction
             {:password   password
              :address    address
              :chain-id   chain-id
-             :tx-hash    tx-hash
-             :tx-params  tx-args
+             :tx         raw-data
              :on-error   #(rf/dispatch [:wallet-connect/on-sign-error %])
              :on-success #(rf/dispatch [:wallet-connect/send-response {:result %}])}]]})))
 
-;; TODO: should reject if "signing" fails
 (rf/reg-event-fx
  :wallet-connect/on-sign-error
  (fn [{:keys [db]} [error]]
-   (let [{:keys [raw-data address event]} (get db :wallet-connect/current-request)
-         method                           (wallet-connect-core/get-request-method event)
-         screen                           (wallet-connect-core/method-to-screen method)]
+   (let [event                      (get-in db [:wallet-connect/current-request :event])
+         {:keys [raw-data address]} (get db :wallet-connect/current-request)
+         method                     (wallet-connect-core/get-request-method event)
+         screen                     (wallet-connect-core/method-to-screen method)]
      (log/error "Failed to sign Wallet Connect request"
                 {:error                error
                  :address              address
@@ -131,13 +127,12 @@
  (fn [{:keys [db]} _]
    (let [web3-wallet      (get db :wallet-connect/web3-wallet)
          current-proposal (get-in db [:wallet-connect/current-proposal :request])]
-     {:db (dissoc db :wallet-connect/current-proposal)
-      :fx [[:effects.wallet-connect/reject-session-proposal
+     {:fx [[:effects.wallet-connect/reject-session-proposal
             {:web3-wallet web3-wallet
              :proposal    current-proposal
              :on-success  #(log/info "Wallet Connect session proposal rejected")
              :on-error    #(log/error "Wallet Connect unable to reject session proposal")}]
-           [:dispatch [:dismiss-modal :screen/wallet.wallet-connect-session-proposal]]]})))
+           [:dispatch [:wallet-connect/reset-current-session]]]})))
 
 ;; NOTE: Currently we only reject a session if the user rejected it
 ;; But this needs to be solidified to ensure other cases:

src/status_im/contexts/wallet/wallet_connect/rpc.cljs

@@ -59,8 +59,3 @@
             password
             chain-id
             legacy?))
-
-(defn wallet-get-suggested-fees
-  [chain-id]
-  (-> (call-rpc "wallet_getSuggestedFees" chain-id)
-      (promesa/then transforms/js->clj)))

src/status_im/contexts/wallet/wallet_connect/session_proposal/style.cljs

@@ -5,15 +5,13 @@
   {:padding-horizontal 20
    :padding-top        12})
 
-(defn approval-note-container
-  [theme]
-  {:margin-horizontal  20
-   :padding-horizontal 16
-   :padding-vertical   12
-   :border-radius      16
-   :border-width       1
-   :border-color       (colors/theme-colors colors/neutral-10 colors/black-opa-30 theme)
-   :background-color   (colors/theme-colors colors/neutral-2_5 colors/black-opa-30 theme)})
+(def approval-note-container
+  {:margin-horizontal 20
+   :padding           12
+   :border-radius     16
+   :border-width      1
+   :border-color      colors/neutral-10
+   :background-color  colors/neutral-2_5})
 
 (def approval-note-title
   {:color         colors/neutral-50
@@ -22,8 +20,10 @@
 (def approval-note-li
   {:flex           1
    :flex-direction :row
-   :align-items    :center
-   :gap            8})
+   :align-items    :center})
+
+(def approval-li-spacer
+  {:width 8})
 
 (def account-switcher-title
   {:padding-horizontal 20})
@@ -31,6 +31,3 @@
 (def account-switcher-list
   {:margin-top         8
    :padding-horizontal 8})
-
-(def footer-buttons-container
-  {:padding-horizontal 0})

src/status_im/contexts/wallet/wallet_connect/session_proposal/view.cljs

@@ -6,27 +6,21 @@
     [quo.theme]
     [react-native.core :as rn]
     [status-im.common.floating-button-page.view :as floating-button-page]
-    [status-im.contexts.wallet.wallet-connect.core :as wallet-connect-core]
     [status-im.contexts.wallet.wallet-connect.session-proposal.style :as style]
     [utils.i18n :as i18n]
-    [utils.re-frame :as rf]
-    [utils.string]))
+    [utils.re-frame :as rf]))
 
 (defn- dapp-metadata
   []
   (let [proposer                 (rf/sub [:wallet-connect/session-proposer])
-        {:keys [icons name url]} (:metadata proposer)
-        first-icon               (first icons)
-        dapp-name                (wallet-connect-core/compute-dapp-name name url)
-        profile-picture          (wallet-connect-core/compute-dapp-icon-path first-icon url)]
+        {:keys [icons name url]} (:metadata proposer)]
     [:<>
      [rn/view {:style style/dapp-avatar}
       [quo/user-avatar
-       {:profile-picture profile-picture
-        :size            :big
-        :full-name       dapp-name}]]
+       {:profile-picture (first icons)
+        :size            :big}]]
      [quo/page-top
-      {:title       dapp-name
+      {:title       name
        :description :context-tag
        :context-tag {:type    :icon
                      :size    32
@@ -37,25 +31,18 @@
   []
   (let [dapp-name (rf/sub [:wallet-connect/session-proposer-name])
         labels    [(i18n/label :t/check-your-account-balance-and-activity)
-                   (i18n/label :t/request-txns-and-message-signing)]
-        theme     (quo.theme/use-theme)]
-    [rn/view {:style (style/approval-note-container theme)}
-     [quo/text
-      {:style  style/approval-note-title
-       :weight :regular
-       :size   :paragraph-2}
+                   (i18n/label :t/request-txns-and-message-signing)]]
+    [rn/view {:style style/approval-note-container}
+     [quo/text {:style style/approval-note-title}
       (i18n/label :t/dapp-will-be-able-to {:dapp-name dapp-name})]
      (map-indexed
       (fn [idx label]
         ^{:key (str idx label)}
         [rn/view {:style style/approval-note-li}
          [quo/icon :i/bullet
-          {:color colors/neutral-40}]
-         [quo/text
-          {:weight :regular
-           :size   :paragraph-2
-           :color  colors/neutral-40}
-          label]])
+          {:color colors/neutral-50}]
+         [rn/view {:style style/approval-li-spacer}]
+         [quo/text label]])
       labels)]))
 
 (defn- format-network-name
@@ -70,14 +57,16 @@
 
 (defn- accounts-list
   []
-  (let [accounts         (rf/sub [:wallet/operable-accounts])
+  (let [accounts         (rf/sub [:wallet/accounts-without-watched-accounts])
         selected-address (rf/sub [:wallet-connect/current-proposal-address])]
     [rn/view {:style style/account-switcher-list}
-     (for [{:keys [address] :as account} accounts]
-       ^{:key (str address)}
+     (for [account accounts]
+       ^{:key (-> account :address str)}
        [quo/account-item
         {:type          :default
-         :state         (if (= address selected-address)
+         :state         (if (and selected-address
+                                 (= (account :address)
+                                    selected-address))
                           :selected
                           :default)
          :account-props account
@@ -112,10 +101,12 @@
                                                       (map format-network-name)
                                                       (string/join ", "))
         network-images                           (mapv :source session-networks)
-        data-item-common-props                   {:blur?  false
-                                                  :card?  false
-                                                  :status :default
-                                                  :size   :large}
+        data-item-common-props                   {:blur?       false
+                                                  :description :default
+                                                  :card?       false
+                                                  :label       :preview
+                                                  :status      :default
+                                                  :size        :large}
         account-data-item-props                  (assoc data-item-common-props
                                                         :right-content {:type :accounts
                                                                         :size :size-32
@@ -125,7 +116,9 @@
                                                         :on-press      show-account-switcher-bottom-sheet
                                                         :title         (i18n/label :t/account-title)
                                                         :subtitle      name
-                                                        :right-icon    :i/chevron-right)
+                                                        :icon-right?   true
+                                                        :right-icon    :i/chevron-right
+                                                        :icon-color    colors/neutral-10)
         networks-data-item-props                 (assoc data-item-common-props
                                                         :right-content {:type :network
                                                                         :data network-images}
@@ -143,20 +136,18 @@
   []
   (let [customization-color (rf/sub [:profile/customization-color])]
     [quo/bottom-actions
-     {:actions                 :two-actions
-      :buttons-container-style style/footer-buttons-container
-      :button-two-label        (i18n/label :t/decline)
-      :button-two-props        {:type                :grey
-                                :accessibility-label :wc-deny-connection
-                                :on-press            (fn []
-                                                       (rf/dispatch
-                                                        [:wallet-connect/reject-session-proposal]))}
-      :button-one-label        (i18n/label :t/connect)
-      :button-one-props        {:customization-color customization-color
-                                :type                :primary
-                                :accessibility-label :wc-connect
-                                :on-press            #(rf/dispatch
-                                                       [:wallet-connect/approve-session])}}]))
+     {:actions          :two-actions
+      :button-two-label (i18n/label :t/decline)
+      :button-two-props {:type                :grey
+                         :accessibility-label :wc-deny-connection
+                         :on-press            #(do (rf/dispatch [:navigate-back])
+                                                   (rf/dispatch
+                                                    [:wallet-connect/reject-session-proposal]))}
+      :button-one-label (i18n/label :t/connect)
+      :button-one-props {:customization-color customization-color
+                         :type                :primary
+                         :accessibility-label :wc-connect
+                         :on-press            #(rf/dispatch [:wallet-connect/approve-session])}}]))
 
 (defn- header
   []

src/status_im/contexts/wallet/wallet_connect/transactions.cljs

@@ -1,24 +1,10 @@
 (ns status-im.contexts.wallet.wallet-connect.transactions
   (:require [cljs-bean.core :as bean]
             [clojure.string :as string]
-            [native-module.core :as native-module]
             [promesa.core :as promesa]
-            [status-im.constants :as constants]
-            [status-im.contexts.wallet.wallet-connect.core :as core]
             [status-im.contexts.wallet.wallet-connect.rpc :as rpc]
-            [utils.money :as money]
             [utils.transforms :as transforms]))
 
-(defn transaction-request?
-  [event]
-  (->> (core/get-request-method event)
-       (contains? #{constants/wallet-connect-eth-send-transaction-method
-                    constants/wallet-connect-eth-sign-transaction-method})))
-
-;; NOTE: Currently we don't allow the user to configure the tx priority as we don't
-;; show the estimated time, but when we implement it, we should allow to change it
-(def ^:constant default-tx-priority :medium)
-
 (defn- strip-hex-prefix
   "Strips the extra 0 in hex value if present"
   [hex-value]
@@ -29,12 +15,12 @@
 
 (defn- format-tx-hex-values
   "Due to how status-go expects hex values, we should remove the extra 0s in transaction hex values e.g. 0x0f -> 0xf"
-  [tx f]
+  [tx]
   (let [tx-keys [:gasLimit :gas :gasPrice :nonce :value :maxFeePerGas :maxPriorityFeePerGas]]
     (reduce (fn [acc tx-key]
               (if (and (contains? tx tx-key)
                        (not (nil? (get tx tx-key))))
-                (update acc tx-key f)
+                (update acc tx-key strip-hex-prefix)
                 acc))
             tx
             tx-keys)))
@@ -43,100 +29,26 @@
   "Formats the transaction and transforms it into a stringified JS object, ready to be passed to an RPC call."
   [tx]
   (-> tx
-      ;; NOTE: removing `:nonce` to compute it when building the transaction on status-go
-      (dissoc :nonce)
-      (format-tx-hex-values strip-hex-prefix)
+      format-tx-hex-values
       bean/->js
       (transforms/js-stringify 0)))
 
-(defn beautify-transaction
-  [tx]
-  (let [hex->number #(-> % (subs 2) native-module/hex-to-number)]
-    (-> tx
-        (format-tx-hex-values hex->number)
-        clj->js
-        (js/JSON.stringify nil 2))))
-
-(defn- gwei->hex
-  [gwei]
-  (->> gwei
-       money/gwei->wei
-       native-module/number-to-hex
-       (str "0x")))
-
-(defn- get-max-fee-per-gas-key
-  "Mapping transaction priority (which determines how quickly a tx is processed)
-  to the `suggested-routes` key that should be used for `:maxPriorityFeePerGas`.
-
-  Returns `:high` | `:medium` | `:low`"
-  [tx-priority]
-  (get {:high   :maxFeePerGasHigh
-        :medium :maxFeePerGasMedium
-        :low    :maxFeePerGasLow}
-       tx-priority))
-
-(defn- dynamic-fee-tx?
-  "Checks if a transaction has dynamic fees (EIP1559)"
-  [tx]
-  (every? tx [:maxFeePerGas :maxPriorityFeePerGas]))
-
-(defn- tx->eip1559-tx
-  "Adds `:maxFeePerGas` and `:maxPriorityFeePerGas` for dynamic fee support (EIP1559) and
-  removes `:gasPrice`, if the chain supports EIP1559 and the transaction doesn't already
-  have dynamic fees."
-  [tx suggested-fees tx-priority]
-  (if (and (:eip1559Enabled suggested-fees)
-           (not (dynamic-fee-tx? tx)))
-    (let [max-fee-per-gas-key      (get-max-fee-per-gas-key tx-priority)
-          max-fee-per-gas          (-> suggested-fees max-fee-per-gas-key gwei->hex)
-          max-priority-fee-per-gas (-> suggested-fees :maxPriorityFeePerGas gwei->hex)]
-      (-> tx
-          (assoc
-           :maxFeePerGas         max-fee-per-gas
-           :maxPriorityFeePerGas max-priority-fee-per-gas)
-          ;; NOTE: `:gasPrice` is used only for legacy Tx, so we discard it in favor of dynamic fees
-          (dissoc :gasPrice)))
-    tx))
-
-(defn- prepare-transaction-fees
-  "Makes sure the transaction has the correct gas and fees properties"
-  [tx tx-priority suggested-fees]
-  (-> (assoc tx
-             ;; NOTE: `gasLimit` is ignored on status-go when building a transaction
-             ;; (`wallet_buildTransaction`), so we're setting it as the `gas` property
-             :gas
-             (or (:gasLimit tx)
-                 (:gas tx)))
-      (dissoc :gasLimit)
-      (tx->eip1559-tx suggested-fees tx-priority)))
-
-(defn prepare-transaction
-  "Formats and builds the incoming transaction, adding the missing properties and returning the final
-  transaction, along with the transaction hash and the suggested fees"
-  [tx chain-id tx-priority]
-  (promesa/let [suggested-fees                    (rpc/wallet-get-suggested-fees chain-id)
-                {:keys [tx-args message-to-sign]} (->>
-                                                    (prepare-transaction-fees tx
-                                                                              tx-priority
-                                                                              suggested-fees)
-                                                    prepare-transaction-for-rpc
-                                                    (rpc/wallet-build-transaction chain-id))]
-    {:tx-args        tx-args
-     :tx-hash        message-to-sign
-     :suggested-fees suggested-fees}))
-
 (defn sign-transaction
-  [password address tx-hash tx-args chain-id]
+  [password address tx chain-id]
   (promesa/let
-    [signature (rpc/wallet-sign-message tx-hash address password)
-     raw-tx    (rpc/wallet-build-raw-transaction chain-id tx-args signature)]
+    [formatted-tx                      (prepare-transaction-for-rpc tx)
+     {:keys [message-to-sign tx-args]} (rpc/wallet-build-transaction chain-id formatted-tx)
+     signature                         (rpc/wallet-sign-message message-to-sign address password)
+     raw-tx                            (rpc/wallet-build-raw-transaction chain-id tx-args signature)]
     raw-tx))
 
 (defn send-transaction
-  [password address tx-hash tx-args chain-id]
+  [password address tx chain-id]
   (promesa/let
-    [signature (rpc/wallet-sign-message tx-hash address password)
-     tx        (rpc/wallet-send-transaction-with-signature chain-id
-                                                           tx-args
-                                                           signature)]
+    [formatted-tx                      (prepare-transaction-for-rpc tx)
+     {:keys [message-to-sign tx-args]} (rpc/wallet-build-transaction chain-id formatted-tx)
+     signature                         (rpc/wallet-sign-message message-to-sign address password)
+     tx                                (rpc/wallet-send-transaction-with-signature chain-id
+                                                                                   tx-args
+                                                                                   signature)]
     tx))

src/status_im/contexts/wallet/wallet_connect/utils.cljs

@@ -11,14 +11,14 @@
 
 (defn timestamp-expired?
   [expiry-timestamp]
-  (when expiry-timestamp
-    (> (current-timestamp) expiry-timestamp)))
+  (> (current-timestamp) expiry-timestamp))
 
 (defn valid-wc-uri?
   [parsed-uri]
-  (let [{:keys [topic version]} parsed-uri]
+  (let [{:keys [topic version expiryTimestamp]} parsed-uri]
     (and (seq topic)
-         (number? version))))
+         (number? version)
+         (number? expiryTimestamp))))
 
 (defn valid-uri?
   "Check if the uri is in the wallet-connect format.

src/status_im/navigation/effects.cljs

@@ -122,9 +122,11 @@
 (defn dismiss-modal
   ([] (dismiss-modal nil))
   ([comp-id]
-   (reset! state/dissmissing true)
-   (navigation/dismiss-modal (name (or comp-id (last @state/modals))))
-   (state/navigation-pop-from comp-id)))
+   (when (or (not comp-id)
+             (state/modal-open? comp-id))
+     (reset! state/dissmissing true)
+     (navigation/dismiss-modal (name (or comp-id (last @state/modals))))
+     (state/navigation-pop-from comp-id))))
 
 (defn navigate-back
   []

src/status_im/navigation/roots.cljs

@@ -37,6 +37,15 @@
                                      :id      :screen/profile.profiles
                                      :options (options/dark-root-options)}}]}}}
 
+   :screen/onboarding.enable-notifications
+   {:root {:stack {:children [{:component {:name    :screen/onboarding.enable-notifications
+                                           :id      :screen/onboarding.enable-notifications
+                                           :options (options/dark-root-options)}}]}}}
+
+   :screen/onboarding.welcome
+   {:root {:stack {:children [{:component {:name    :screen/onboarding.welcome
+                                           :id      :screen/onboarding.welcome
+                                           :options (options/dark-root-options)}}]}}}
    :screen/onboarding.syncing-results
    {:root {:stack {:children [{:component {:name    :screen/onboarding.syncing-results
                                            :id      :screen/onboarding.syncing-results

src/status_im/navigation/screens.cljs

@@ -118,7 +118,6 @@
     [status-im.contexts.wallet.send.transaction-confirmation.view :as wallet-transaction-confirmation]
     [status-im.contexts.wallet.send.transaction-progress.view :as wallet-transaction-progress]
     [status-im.contexts.wallet.swap.select-asset-to-pay.view :as wallet-swap-select-asset-to-pay]
-    [status-im.contexts.wallet.swap.set-spending-cap.view :as wallet-swap-set-spending-cap]
     [status-im.contexts.wallet.swap.swap-confirmation.view :as wallet-swap-confirmation]
     [status-im.contexts.wallet.swap.swap-proposal.view :as wallet-swap-propasal]
     [status-im.contexts.wallet.wallet-connect.modals.send-transaction.view :as
@@ -348,15 +347,11 @@
      :component enter-seed-phrase/view}
 
     {:name      :screen/onboarding.enable-notifications
-     :options   {:theme                  :dark
-                 :layout                 options/onboarding-transparent-layout
-                 :animations             (merge
-                                          transitions/new-to-status-modal-animations
-                                          transitions/push-animations-for-transparent-background)
-                 :popGesture             false
-                 :modalPresentationStyle :overCurrentContext
-                 :hardwareBackButton     {:dismissModalOnPress false
-                                          :popStackOnPress     false}}
+     :options   {:theme      :dark
+                 :layout     options/onboarding-transparent-layout
+                 :animations (merge
+                              transitions/new-to-status-modal-animations
+                              transitions/push-animations-for-transparent-background)}
      :component enable-notifications/view}
 
     {:name      :screen/onboarding.identifiers
@@ -531,10 +526,6 @@
      :options   {:modalPresentationStyle :overCurrentContext}
      :component wallet-swap-confirmation/view}
 
-    {:name      :screen/wallet.swap-set-spending-cap
-     :options   {:sheet? true}
-     :component wallet-swap-set-spending-cap/view}
-
     {:name      :scan-profile-qr-code
      :options   (merge
                  options/dark-screen