feat!:enable sync fallback

fix styling and navigation
lint and status-go update
2024-08-01 17:10:23 +08:00 · 2024-07-25 16:05:05 +05:30 · 2024-07-25 15:11:58 +05:30 · 2024-07-25 14:35:38 +05:30 · 2024-07-25 11:21:31 +03:00 · 2024-07-24 23:06:41 -03:00
153 changed files with 6138 additions and 4321 deletions
@@ -74,7 +74,8 @@
                ;; https://github.com/borkdude/clj-kondo/issues/867
                :unresolved-symbol             {:exclude [PersistentPriorityMap.EMPTY
                                                          number
-                                                          legacy.status-im.test-helpers/restore-app-db]}
+                                                          legacy.status-im.test-helpers/restore-app-db
+                                                          (cljs.test/is [match-strict?])]}
                :unresolved-var                {:level :error}
                :unsorted-required-namespaces  {:level :error}
                :unused-alias                  {:level :warning}
@@ -1,10 +1,15 @@
-*
+/*
+
+# Format top-level js files.
 !*.js
-!*/
-*.clj-kondo
-*.shadow-cljs
-modules
-result
-target
-component-spec
-/app
+
+# Ignore all except src/js/**/*.js
+!/src/
+/src/*
+!/src/js
+!/src/js/**/*.js
+
+# Ignore all except translations/en.json
+!/translations/
+/translations/*
+!/translations/en.json
@@ -6,4 +6,8 @@ module.exports = {
  tabWidth: 2,
  trailingComma: 'all',
  useTabs: false,
+
+  // JSON sorting
+  jsonSortOrder: '{ "/.*/": "caseInsensitiveLexical" } ',
+  plugins: ['prettier-plugin-sort-json'],
 };
@@ -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 --write .
+	node_modules/.bin/prettier --check .

 # NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
 lint-fix: export TARGET := clojure
@@ -353,13 +353,17 @@ 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' \
+		"yarn shadow-cljs watch test --verbose --config-merge '{:output-to \"$(SHADOW_OUTPUT_TO)\" :ns-regexp \"$(SHADOW_NS_REGEXP)\"}'" \
 		"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
@@ -1,67 +1,43 @@
-## Getting Started 
-
-[Starting Guide](starting-guide.md)
-
-[IDE Setup](ide-setup.md)
-
+## Getting Started

+- [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

-[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)
-
+- [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)

 ## 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)
@@ -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/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/tests/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:
@@ -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.
@@ -0,0 +1,167 @@
+# 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).
@@ -711,11 +711,11 @@
  },

  {
-    "path": "nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8",
+    "path": "nubank/matcher-combinators/3.9.1/matcher-combinators-3.9.1",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "4c94bd510f0c18a20191e46dd6becedebc640bbd",
-      "sha256": "0wpla2hx0s4mda58ndyd8938zmnz1gyhgfr6pzfphy27xfbvsssl"
+      "sha1": "f0830a112cae8ee931a90d9f39214a0ed4d44150",
+      "sha256": "1rjcgqhms84xmnhs7sqcd3b2dpa37mmzgz2yz33yz2rdb9skl96g"
    }
  },

@@ -77,7 +77,7 @@ net/cgrand/macrovich/0.2.1/macrovich-0.2.1.jar
 net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar
 nrepl/bencode/1.1.0/bencode-1.1.0.jar
 nrepl/nrepl/1.0.0/nrepl-1.0.0.jar
-nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8.jar
+nubank/matcher-combinators/3.9.1/matcher-combinators-3.9.1.jar
 org/apache/ant/ant/1.10.11/ant-1.10.11.jar
 org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
 org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar
@@ -97,7 +97,8 @@
    "jest-silent-reporter": "^0.5.0",
    "nodemon": "^2.0.16",
    "nyc": "^14.1.1",
-    "prettier": "^2.8.8",
+    "prettier": "^3.3.3",
+    "prettier-plugin-sort-json": "^4.0.0",
    "process": "0.11.10",
    "react-test-renderer": "18.1.0",
    "shadow-cljs": "2.26.2",
@@ -19,7 +19,7 @@
                [cider/piggieback "0.4.1"]
                [org.slf4j/slf4j-nop "2.0.9"]
                [re-frisk-remote "1.6.0"]
-                [nubank/matcher-combinators "3.8.8"]
+                [nubank/matcher-combinators "3.9.1"]

                ;; Use the same version specified in the Nix dependency.
                [clj-kondo/clj-kondo "2024.03.13"]
@@ -18,7 +18,6 @@
    legacy.status-im.multiaccounts.logout.core
    [legacy.status-im.multiaccounts.model :as multiaccounts.model]
    legacy.status-im.multiaccounts.update.core
-    legacy.status-im.network.net-info
    legacy.status-im.pairing.core
    legacy.status-im.profile.core
    legacy.status-im.search.core
@@ -1,56 +0,0 @@
-(ns legacy.status-im.network.net-info
-  (:require
-    ["@react-native-community/netinfo" :default net-info]
-    [native-module.core :as native-module]
-    [re-frame.core :as re-frame]
-    [taoensso.timbre :as log]
-    [utils.re-frame :as rf]))
-
-(rf/defn change-network-status
-  [{:keys [db] :as cofx} is-connected?]
-  (rf/merge cofx
-            {:db (assoc db :network-status (if is-connected? :online :offline))}))
-
-(rf/defn change-network-type
-  [{:keys [db] :as cofx} network-type expensive?]
-  (rf/merge cofx
-            {:db                       (assoc db :network/type network-type)
-             :network/notify-status-go [network-type expensive?]
-             :dispatch                 [:mobile-network/on-network-status-change]}))
-
-(rf/defn handle-network-info-change
-  {:events [::network-info-changed]}
-  [{:keys [db] :as cofx} {:keys [isConnected type details] :as state}]
-  (let [old-network-status  (:network-status db)
-        old-network-type    (:network/type db)
-        connectivity-status (if isConnected :online :offline)
-        status-changed?     (= connectivity-status old-network-status)
-        type-changed?       (= type old-network-type)]
-    (log/debug "[net-info]"
-               "old-network-status"  old-network-status
-               "old-network-type"    old-network-type
-               "connectivity-status" connectivity-status
-               "type"                type
-               "details"             details)
-    (rf/merge cofx
-              (when-not status-changed?
-                (change-network-status isConnected))
-              (when-not type-changed?
-                (change-network-type type (:is-connection-expensive details))))))
-
-(defn add-net-info-listener
-  []
-  (when net-info
-    (.addEventListener ^js net-info
-                       #(re-frame/dispatch [::network-info-changed
-                                            (js->clj % :keywordize-keys true)]))))
-
-(re-frame/reg-fx
- :network/listen-to-network-info
- (fn []
-   (add-net-info-listener)))
-
-(re-frame/reg-fx
- :network/notify-status-go
- (fn [[network-type expensive?]]
-   (native-module/connection-change network-type expensive?)))
@@ -4,6 +4,7 @@
    [re-frame.core :as re-frame]
    [react-native.platform :as utils.platform]
    [status-im.common.json-rpc.events :as json-rpc]
+    [status-im.common.new-device-sheet.view :as new-device-sheet]
    [status-im.config :as config]
    [status-im.navigation.events :as navigation]
    [taoensso.timbre :as log]
@@ -220,6 +221,12 @@
                  :name            (:name metadata)
                  :device-type     (:deviceType metadata))})

+
+(defn should-show-syncing-pop-up?
+  [db installations]
+  (and (:syncing/pairing-process-initiated? db)
+       (first (filter #(not (get-in db [:pairing/installations (:id %)])) installations))))
+
 (rf/defn handle-installations
  [{:keys [db]} installations]
  {:db (update db
@@ -228,7 +235,10 @@
                 (fn [acc {:keys [id] :as i}]
                   (update acc id merge (installation<-rpc i)))
                 %
-                 installations))})
+                 installations))
+   :fx [(when-let [new-installation (should-show-syncing-pop-up? db installations)]
+          [:dispatch
+           [:show-bottom-sheet {:content (fn [] [new-device-sheet/view (:id new-installation)])}]])]})

 (rf/defn load-installations
  {:events [:pairing.callback/get-our-installations-success]}
@@ -243,6 +253,24 @@
               {}
               installations))})

+(rf/defn finish-seed-phrase-fallback-syncing
+  {:events [:pairing/finish-seed-phrase-fallback-syncing]}
+  [{:keys [db]}]
+  {:fx [[:dispatch [:show-bottom-sheet {:content (fn [] [new-device-sheet/view-2])}]]
+        [:json-rpc/call
+         [{:method      "wakuext_finishPairingThroughSeedPhraseProcess"
+           :params      [{:installationId (:syncing/installation-id db)}]
+           :js-response true
+           :on-success  #(rf/dispatch [:sanitize-messages-and-process-response %])}]]]})
+
+(rf/defn pair-and-sync
+  {:events [:pairing/pair-and-sync]}
+  [cofx installation-id]
+  {:fx [[:json-rpc/call
+         [{:method     "wakuext_enableAndSyncInstallation"
+           :params     [{:installationId installation-id}]
+           :on-success #(log/debug "successfully synced devices")}]]]})
+
 (rf/defn enable-installation-success
  {:events [:pairing.callback/enable-installation-success]}
  [cofx installation-id]
@@ -15,8 +15,6 @@
 (reg-root-key-sub :visibility-status-updates :visibility-status-updates)
 (reg-root-key-sub :fleets/custom-fleets :custom-fleets)
 (reg-root-key-sub :ui/search :ui/search)
-(reg-root-key-sub :network/type :network/type)
-(reg-root-key-sub :network-status :network-status)
 (reg-root-key-sub :peer-stats/count :peer-stats/count)
 (reg-root-key-sub :peers-summary :peers-summary)
 (reg-root-key-sub :web3-node-version :web3-node-version)
@@ -127,7 +127,7 @@
                                                [:app-state
                                                 :current-chat-id
                                                 :network
-                                                 :network-status
+                                                 :network/status
                                                 :peers-summary
                                                 :sync-state
                                                 :view-id
@@ -171,7 +171,7 @@
  #js
   {:getEnforcing {}})

-(def net-info #js {})
+(def net-info #js {:addEventListener identity})
 (def react-native-biometrics #js {:default {}})
 (def react-native-static-safe-area-insets #js {:default {}})

@@ -1,5 +1,6 @@
 (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]
@@ -12,13 +13,14 @@
     [:map {:closed true}
      [:type {:optional true} [:enum :asset :collectible]]
      [:context? {:optional true} [:maybe :boolean]]
-      [:image :schema.common/image-source]
+      [:image {:optional true} [:maybe :schema.common/image-source]]
+      [:token {:optional true} [:maybe [:or :keyword :string]]]
      [:network-image {:optional true} [:maybe :schema.common/image-source]]
      [:container-style {:optional true} [:maybe :map]]]]]
   :any])

 (defn- view-internal
-  [{:keys [type context? image network-image container-style]}]
+  [{:keys [type context? image token network-image container-style]}]
  [rn/view
   {:style               (merge style/container container-style)
    :accessibility-label :token-avatar}
@@ -32,9 +34,11 @@
                      [])
             :style style/hole-view}
      platform/android? (assoc :key context?))
-    [rn/image
-     {:source image
-      :style  (style/image type)}]]
+    [token/view
+     {:size         :size-32
+      :token        token
+      :style        (style/image type)
+      :image-source image}]]
   (when context?
     [rn/image
      {:source network-image
@@ -21,12 +21,17 @@
                       (colors/theme-colors colors/white colors/neutral-95 theme))})

 (defn buttons-container
-  [actions]
-  {:flex-direction     (if (= actions :two-vertical-actions) :column :row)
-   :justify-content    :space-around
-   :padding-vertical   12
-   :gap                12
-   :padding-horizontal 20})
+  [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})

 (def description-top
  {:flex-direction  :row
@@ -30,7 +30,8 @@
      [:button-two-props {:optional true} [:maybe :map]]
      [:scroll? {:optional true} [:maybe :boolean]]
      [:blur? {:optional true} [:maybe :boolean]]
-      [:container-style {:optional true} [:maybe :map]]]]]
+      [:container-style {:optional true} [:maybe :map]]
+      [:buttons-container-style {:optional true} [:maybe :map]]]]]
   :any])

 (def ^:private role-icon
@@ -42,7 +43,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
-           context-tag-props]}]
+           buttons-container-style context-tag-props]}]
  (let [theme (quo.theme/use-theme)]
    [rn/view
     {:style (merge (style/container scroll? blur? theme) container-style)}
@@ -72,12 +73,13 @@
            :context (i18n/label (keyword "t" role))}
           context-tag-props)]])

-     [rn/view {:style (style/buttons-container actions)}
+     [rn/view {:style (style/buttons-container actions buttons-container-style)}
      (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}
@@ -86,6 +88,7 @@
      [button/button
       (merge
        {:size                40
+         :container-style     style/button-container
         :background          (when (or blur? scroll?) :blur)
         :theme               theme
         :accessibility-label :button-one}
@@ -28,6 +28,7 @@
        {: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"))
@@ -107,7 +107,7 @@
          :style  (style/description blur? theme)}
         description])]
     (when (= type :account) [tiny-tag/view {:label tag-label}])
-     (when (= type :spending-cap)
+     (when (and (= type :spending-cap) button-icon)
       [button/button
        {:type      :outline
         :size      24
@@ -47,3 +47,12 @@
 (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})
@@ -1,5 +1,6 @@
 (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]
@@ -20,9 +21,15 @@
      :on-press-in         on-press-in
      :on-press-out        on-press-out}
     [rn/view {:style style/container-info}
-      [fast-image/fast-image
-       {:source (:avatar dapp)
-        :style  {:width 32 :height 32}}]
+      (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)}]])
      [rn/view {:style style/user-info}
       [text/text
        {:weight          :semi-bold
@@ -121,6 +121,7 @@
      [: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]]]
@@ -0,0 +1,31 @@
+(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"))))
@@ -0,0 +1,74 @@
+(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})
@@ -0,0 +1,121 @@
+(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))
@@ -186,6 +186,7 @@
    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
@@ -472,6 +473,7 @@
 (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)
@@ -112,6 +112,7 @@
    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
@@ -43,6 +43,7 @@
   :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")
@@ -23,7 +23,7 @@
  (oops/ocall wc-utils
              "buildApprovedNamespaces"
              (bean/->js {:proposal            proposal
-                          :supportedNamespaces supported-namespaces})))
+                          :supportedNamespaces (clj->js supported-namespaces)})))

 ;; Get an error from this list:
 ;; https://github.com/WalletConnect/walletconnect-monorepo/blob/c6e9529418a0c81d4efcc6ac4e61f242a50b56c5/packages/utils/src/errors.ts
@@ -51,9 +51,10 @@

 (defn reject-session
  [{:keys [web3-wallet id reason]}]
-  (.rejectSession web3-wallet
-                  (clj->js {:id     id
-                            :reason reason})))
+  (oops/ocall web3-wallet
+              "rejectSession"
+              (bean/->js {:id     id
+                          :reason reason})))

 (defn approve-session
  [{:keys [web3-wallet id approved-namespaces]}]
@@ -62,16 +63,17 @@
              (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
@@ -0,0 +1,24 @@
+(ns status-im.common.new-device-sheet.style
+  (:require [quo.foundations.colors :as colors]))
+
+(def heading
+  {:padding-left   20
+   :padding-bottom 8})
+
+(def message
+  {:padding-horizontal 20
+   :padding-top        4})
+
+(def warning
+  {:margin-horizontal 20
+   :margin-top        10})
+
+(def drawer-container
+  {:padding-horizontal 13
+   :padding-top        16})
+
+(def settings-subtext
+  {:color         colors/white-opa-70
+   :align-self    :center
+   :margin-bottom 12})
+
@@ -0,0 +1,82 @@
+(ns status-im.common.new-device-sheet.view
+  (:require
+    [quo.core :as quo]
+    [status-im.common.new-device-sheet.style :as style]
+    [utils.i18n :as i18n]
+    [utils.re-frame :as rf]))
+
+(defn- dismiss-keyboard
+  []
+  (rf/dispatch [:dismiss-keyboard]))
+
+(defn- hide-bottom-sheet
+  []
+  (rf/dispatch [:hide-bottom-sheet]))
+
+(defn- pair-and-sync
+  [installation-id]
+  (rf/dispatch [:pairing/pair-and-sync installation-id])
+  (hide-bottom-sheet))
+
+(defn view
+  [installation-id]
+  (dismiss-keyboard)
+  [:<>
+   [quo/text
+    {:weight              :semi-bold
+     :size                :heading-2
+     :accessibility-label :new-device-sheet-heading
+     :style               style/heading}
+    (i18n/label :t/pair-new-device-and-sync)]
+   [quo/text
+    {:weight              :regular
+     :size                :paragraph-1
+     :accessibility-label :new-device-sheet-message
+     :style               style/message}
+    (i18n/label :t/new-device-detected)]
+   [quo/text
+    {:weight              :semi-bold
+     :size                :heading-2
+     :accessibility-label :new-device-installation-id
+     :style               style/heading}
+    installation-id]
+   [quo/bottom-actions
+    {:actions          :two-actions
+     :blur?            true
+     :container-style  {:margin-top 12}
+     :button-two-label (i18n/label :t/cancel)
+     :button-two-props {:type     :grey
+                        :on-press hide-bottom-sheet}
+     :button-one-label (i18n/label :t/pair-and-sync)
+     :button-one-props {:on-press #(pair-and-sync installation-id)}}]])
+
+(defn view-2
+  []
+  (let [installation-id (rf/sub [:profile/installation-id])]
+    (dismiss-keyboard)
+    [:<>
+     [quo/text
+      {:weight              :semi-bold
+       :size                :heading-2
+       :accessibility-label :new-device-sheet-heading
+       :style               style/heading}
+      (i18n/label :t/pair-new-device-and-sync)]
+     [quo/text
+      {:weight              :regular
+       :size                :paragraph-1
+       :accessibility-label :new-device-sheet-message
+       :style               style/message}
+      (i18n/label :t/check-new-device)]
+     [quo/text
+      {:weight              :semi-bold
+       :size                :heading-2
+       :accessibility-label :new-device-installation-id
+       :style               style/heading}
+      installation-id]
+     [quo/bottom-actions
+      {:actions          :one-action
+       :blur?            true
+       :container-style  {:margin-top 12}
+       :button-one-label (i18n/label :t/close)
+       :button-one-props {:type     :grey
+                          :on-press hide-bottom-sheet}}]]))
@@ -45,6 +45,11 @@
 (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)
@@ -276,16 +281,21 @@
  #{wallet-connect-personal-sign-method
    wallet-connect-eth-sign-method
    wallet-connect-eth-send-transaction-method
-    wallet-connect-eth-sign-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-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")
@@ -506,6 +516,9 @@
 (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)
@@ -567,5 +580,8 @@
 (def ^:const max-recommended-slippage 5)
 (def ^:const max-slippage-decimal-places 2)
 (def ^:const swap-default-provider
-  {:name                     "Paraswap"
+  {:name                     :paraswap
+   :full-name                "Paraswap"
+   :color                    :blue
+   :contract-address         "0xdef171fe48cf0115b1d80b88dc8eab59176fee57"
   :terms-and-conditions-url "https://files.paraswap.io/tos_v4.pdf"})
@@ -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]
+  [community-id signatures addresses-to-reveal airdrop-address _share-future-addresses?]
  (promesa/create
   (fn [p-resolve p-reject]
     (rpc/call
@@ -41,15 +41,16 @@
       :on-error    p-reject}))))

 (defn- request-to-join
-  [community-id signatures addresses-to-reveal airdrop-address]
+  [community-id signatures addresses-to-reveal airdrop-address share-future-addresses?]
  (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}]
+       :params      [{:communityId          community-id
+                      :signatures           signatures
+                      :addressesToReveal    addresses-to-reveal
+                      :airdropAddress       airdrop-address
+                      :shareFutureAddresses share-future-addresses?}]
       :js-response true
       :on-success  p-resolve
       :on-error    p-reject}))))
@@ -64,15 +65,18 @@

 (defn- sign-and-call-endpoint
  [{:keys [community-id password pub-key
-           addresses-to-reveal airdrop-address
+           addresses-to-reveal airdrop-address share-future-addresses?
           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)]
+                                          airdrop-address
+                                          share-future-addresses?)]
        (run-callback-or-event on-success result))
      (promesa/catch #(run-callback-or-event on-error %))))

@@ -87,6 +91,7 @@
      [: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?]]]
@@ -17,13 +17,12 @@
 (rf/reg-event-fx :communities/initialize-permission-addresses initialize-permission-addresses)

 (defn do-init-permission-addresses
-  [{:keys [db]} [community-id revealed-accounts]]
+  [{:keys [db]} [community-id revealed-accounts share-future-addresses?]]
  (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
@@ -35,10 +34,7 @@
                                     first
                                     :address))]
    {:db (-> db
-             ;; 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/selected-share-all-addresses community-id] share-future-addresses?)
             (assoc-in [:communities/all-addresses-to-reveal community-id] addresses-to-reveal)
             (assoc-in [:communities/all-airdrop-addresses community-id] airdrop-address))
     :fx [[:dispatch
@@ -60,36 +56,44 @@
  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]}]]
-  (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))]
+  [{: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?)]
    {:fx [[:effects.community/edit-shared-addresses
-           {: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]}]]}))
+           {: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]}]]}))

 (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]]
+ (fn [_ [community-id addresses-to-reveal airdrop-address share-future-addresses?]]
   {: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
@@ -70,7 +70,7 @@
      (is
       (match?
        {:db (-> (:db cofx)
-                 (assoc-in [:communities/selected-share-all-addresses community-id] false)
+                 (assoc-in [:communities/selected-share-all-addresses community-id] true)
                 (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])))))
+        (sut/do-init-permission-addresses cofx [community-id revealed-accounts true])))))

  ;; 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] false)
+                 (assoc-in [:communities/selected-share-all-addresses community-id] true)
                 (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]))))))
+        (sut/do-init-permission-addresses cofx [community-id revealed-accounts true]))))))

 (deftest edit-shared-addresses-test
  (testing
@@ -109,6 +109,7 @@
    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"
@@ -116,22 +117,24 @@
          actual
          (sut/edit-shared-addresses
           cofx
-           [{: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)))}])
+           [{: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)))}])

          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
-                   :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
+                   :share-future-addresses? share-future-addresses?
+                   :airdrop-address         airdrop-address
+                   :on-success              fn?
+                   :on-error                [:communities/edit-shared-addresses-failure community-id]}]]}
           actual))

      (on-success-wrapper)))
@@ -203,7 +203,9 @@
                                                                       :addresses-for-permissions])
                                                         (rf/dispatch [:hide-bottom-sheet]))}]))}])
              (rf/dispatch [:communities/set-share-all-addresses id flag-share-all-addresses]))
-            (rf/dispatch [:communities/set-addresses-to-reveal id addresses-to-reveal])))
+            (do
+              (rf/dispatch [:communities/set-share-all-addresses id flag-share-all-addresses])
+              (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)]

@@ -260,7 +262,8 @@

        can-edit-addresses? (rf/sub [:communities/can-edit-shared-addresses? id])

-        wallet-accounts (rf/sub [:wallet/operable-accounts-without-watched-accounts])
+        wallet-accounts (rf/sub [:wallet/operable-accounts])
+        joined (rf/sub [:communities/community-joined id])
        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)

@@ -285,7 +288,6 @@
            (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
@@ -310,6 +312,7 @@
                                 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
@@ -47,12 +47,11 @@
     :label               (i18n/label :t/view-token-gating)}))

 (defn- action-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)}))
+  [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)})

 (defn- action-toggle-muted
  [id muted? muted-till chat-type]
@@ -130,7 +129,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)
+         (action-mark-as-read chat-id)
         (action-toggle-muted chat-id muted muted-till chat-type)
         (action-notification-settings)
         (action-pinned-messages chat-id)
@@ -143,7 +142,7 @@
       [[(action-view-members-and-details community-id chat-id)
         (when token-gated?
           (action-token-requirements))
-         (action-mark-as-read)
+         (action-mark-as-read chat-id)
         (action-toggle-muted chat-id muted muted-till chat-type)
         (action-notification-settings)
         (when config/fetch-messages-enabled?
@@ -16,6 +16,7 @@
    [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
@@ -372,15 +373,14 @@
    (when (and community joined (not fetching-revealed-accounts))
      {:db (assoc-in db [:communities community-id :fetching-revealed-accounts] true)
       :json-rpc/call
-       [{: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]))}]})))
+       [{: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]))}]})))

 (rf/reg-event-fx :communities/get-revealed-accounts get-revealed-accounts)

@@ -399,22 +399,18 @@
     [:json-rpc/call :schema.common/rpc-call]]]])

 (rf/reg-event-fx :communities/get-revealed-accounts-success
- (fn [{:keys [db]} [community-id on-success revealed-accounts-js]]
+ (fn [{:keys [db]} [community-id on-success request-to-join]]
   (when-let [community (get-in db [:communities community-id])]
-     (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))
-
+     (let [revealed-accounts (collection-utils/index-by :address (:revealedAccounts request-to-join))
+           share-future-addresses? (:shareFutureAddresses request-to-join)
           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)])]}))))
+               [:dispatch (conj on-success revealed-accounts share-future-addresses?)])]}))))

 (rf/reg-event-fx :communities/get-revealed-accounts-failed
 (fn [{:keys [db]} [community-id]]
@@ -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_getRevealedAccounts"
-                     :params [community-id "profile-public-key"]}
+        (is (match? {:method "wakuext_latestRequestToJoinForCommunity"
+                     :params [community-id]}
                    (-> effects :json-rpc/call first (select-keys [:method :params]))))))))

 (deftest handle-community-test
@@ -117,13 +117,14 @@
                     {:community community-name})}]]]})))

 (defn request-to-join-with-signatures
-  [_ [community-id addresses-to-reveal signatures]]
+  [_ [community-id addresses-to-reveal signatures share-future-addresses?]]
  {:fx [[:json-rpc/call
         [{:method      "wakuext_requestToJoinCommunity"
-           :params      [{:communityId       community-id
-                          :signatures        signatures
-                          :addressesToReveal addresses-to-reveal
-                          :airdropAddress    (first addresses-to-reveal)}]
+           :params      [{:communityId          community-id
+                          :signatures           signatures
+                          :addressesToReveal    addresses-to-reveal
+                          :shareFutureAddresses share-future-addresses?
+                          :airdropAddress       (first addresses-to-reveal)}]
           :js-response true
           :on-success  [:communities/requested-to-join]
           :on-error    [:communities/requested-to-join-error community-id]}]]]})
@@ -153,16 +154,18 @@
 (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])
-        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])
+        share-future-addresses? (get-in db [:communities/selected-share-all-addresses 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
-            :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
+            :share-future-addresses? share-future-addresses?
+            :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)
@@ -37,19 +37,22 @@
                (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"]
-        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]}]]]}]
+  (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]}]]]}]
    (is (match? expected
                (sut/request-to-join-with-signatures cofx
-                                                     [community-id addresses-to-reveal signatures])))))
+                                                     [community-id addresses-to-reveal signatures
+                                                      share-future-addresses?])))))
@@ -0,0 +1,55 @@
+(ns status-im.contexts.networks.events
+  (:require
+    ["@react-native-community/netinfo" :default net-info]
+    [native-module.core :as native-module]
+    [status-im.feature-flags :as ff]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
+
+(rf/reg-fx
+ :effects.network/listen-to-network-info
+ (fn []
+   (when net-info
+     (.addEventListener ^js net-info
+                        #(rf/dispatch [:network/on-state-change
+                                       (js->clj % :keywordize-keys true)])))))
+
+(rf/reg-event-fx
+ :network/on-state-change
+ (fn [{:keys [db]} [{:keys [isConnected type details]}]]
+   (let [old-network-status       (:network/status db)
+         old-network-type         (:network/type db)
+         connectivity-status      (if isConnected :online :offline)
+         status-changed?          (not= connectivity-status old-network-status)
+         type-changed?            (not= type old-network-type)
+         is-connection-expensive? (:is-connection-expensive details)]
+     (log/debug "[net-info]"
+                "old-network-status"  old-network-status
+                "old-network-type"    old-network-type
+                "connectivity-status" connectivity-status
+                "type"                type
+                "details"             details)
+     {:fx [(when status-changed?
+             [:dispatch [:network/on-network-status-change isConnected]])
+           (when type-changed?
+             [:dispatch [:network/on-network-type-change type is-connection-expensive?]])]})))
+
+(rf/reg-event-fx
+ :network/on-network-type-change
+ (fn [{:keys [db]} [network-type expensive?]]
+   {:db (assoc db :network/type network-type)
+    :fx [[:effects.network/notify-status-go network-type expensive?]
+         [:dispatch [:mobile-network/on-network-status-change]]]}))
+
+(rf/reg-event-fx
+ :network/on-network-status-change
+ (fn [{:keys [db]} [is-connected?]]
+   (let [network-status (if is-connected? :online :offline)]
+     {:db (assoc db :network/status network-status)
+      :fx [(when (ff/enabled? ::ff/wallet.wallet-connect)
+             [:dispatch [:wallet-connect/reload-on-network-change is-connected?]])]})))
+
+(rf/reg-fx
+ :effects.network/notify-status-go
+ (fn [network-type expensive?]
+   (native-module/connection-change network-type expensive?)))
@@ -17,3 +17,17 @@
  {:events [:onboarding/overlay-dismiss]}
  [_]
  {:onboarding/overlay-dismiss-fx nil})
+
+(re-frame/reg-fx
+ :onboarding/overlay-show-fx
+ (fn []
+   (when-let [blur-show-fn @overlay/blur-show-fn-atom]
+     (blur-show-fn))
+   (when-let [push-animation-fn @profiles/push-animation-fn-atom]
+     (push-animation-fn))))
+
+(rf/defn overlay-show
+  {:events [:onboarding/overlay-show]}
+  [_]
+  {:onboarding/overlay-show-fx nil})
+
@@ -73,7 +73,9 @@
                                      :onboarding/navigated-to-enter-seed-phrase-from-screen
                                      :screen/onboarding.new-to-status)]]
               :dispatch-later [{:ms       constants/onboarding-generating-keys-animation-duration-ms
-                                 :dispatch [:init-root :screen/onboarding.enable-notifications]}]
+                                 :dispatch [:navigate-to-within-stack
+                                            [:screen/onboarding.enable-notifications
+                                             :screen/onboarding.generating-keys]]}]
               :db             (-> db
                                   (dissoc :profile/login)
                                   (dissoc :auth-method)
@@ -123,25 +125,31 @@
                                                          mnemonic key-uid]))
                                    on-error]})

+;; TODO: clear syncing data if key-uid does not match
 (rf/defn seed-phrase-validated
  {:events [:onboarding/seed-phrase-validated]}
  [{:keys [db]} seed-phrase key-uid]
-  (if (contains? (:profile/profiles-overview db) key-uid)
-    {:effects.utils/show-confirmation
-     {:title               (i18n/label :t/multiaccount-exists-title)
-      :content             (i18n/label :t/multiaccount-exists-content)
-      :confirm-button-text (i18n/label :t/unlock)
-      :on-accept           (fn []
-                             (re-frame/dispatch [:pop-to-root :screen/profile.profiles])
-                             (re-frame/dispatch
-                              [:profile/profile-selected key-uid]))
-      :on-cancel           #(re-frame/dispatch [:pop-to-root :multiaccounts])}}
-    {:db       (assoc-in db [:onboarding/profile :seed-phrase] seed-phrase)
-     :dispatch [:navigate-to-within-stack
-                [:screen/onboarding.create-profile
-                 (get db
-                      :onboarding/navigated-to-enter-seed-phrase-from-screen
-                      :screen/onboarding.new-to-status)]]}))
+  (let [next-screen (if (and (seq (:syncing/key-uid db))
+                             (= (:syncing/key-uid db) key-uid))
+                      :screen/onboarding.create-profile-password
+                      :screen/onboarding.create-profile)]
+
+    (if (contains? (:profile/profiles-overview db) key-uid)
+      {:effects.utils/show-confirmation
+       {:title               (i18n/label :t/multiaccount-exists-title)
+        :content             (i18n/label :t/multiaccount-exists-content)
+        :confirm-button-text (i18n/label :t/unlock)
+        :on-accept           (fn []
+                               (re-frame/dispatch [:pop-to-root :screen/profile.profiles])
+                               (re-frame/dispatch
+                                [:profile/profile-selected key-uid]))
+        :on-cancel           #(re-frame/dispatch [:pop-to-root :multiaccounts])}}
+      {:db       (assoc-in db [:onboarding/profile :seed-phrase] seed-phrase)
+       :dispatch [:navigate-to-within-stack
+                  [next-screen
+                   (get db
+                        :onboarding/navigated-to-enter-seed-phrase-from-screen
+                        :screen/onboarding.new-to-status)]]})))

 (rf/defn navigate-to-create-profile
  {:events [:onboarding/navigate-to-create-profile]}
@@ -187,14 +195,3 @@
                                           {: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]}]}))
@@ -2,6 +2,13 @@
  (:require
    [quo.foundations.colors :as colors]))

+(def absolute-fill
+  {:position :absolute
+   :top      0
+   :bottom   0
+   :left     0
+   :right    0})
+
 (defn page-container
  [in-onboarding?]
  {:flex             1
@@ -26,33 +26,62 @@
    :title-accessibility-label       :progress-screen-title
    :description-accessibility-label :progress-screen-sub-title}])

+(defn navigate-to-enter-seed-phrase
+  [view-id]
+  (if (= view-id :screen/onboarding.syncing-progress-intro)
+    (do
+      (rf/dispatch [:navigate-back-to :screen/onboarding.sync-or-recover-profile])
+      (debounce/debounce-and-dispatch
+       [:onboarding/navigate-to-sign-in-by-seed-phrase :screen/onboarding.sync-or-recover-profile]
+       300))
+    (do
+      (rf/dispatch [:navigate-back])
+      (debounce/debounce-and-dispatch [:onboarding/overlay-show] 100)
+      (debounce/debounce-and-dispatch [:open-modal :screen/onboarding.new-to-status] 200)
+      (debounce/debounce-and-dispatch
+       [:onboarding/navigate-to-sign-in-by-seed-phrase :screen/onboarding.new-to-status]
+       300))))
+
 (defn try-again-button
-  [profile-color in-onboarding? logged-in?]
-  [quo/button
-   {:on-press            (fn []
-                           (rf/dispatch [:syncing/clear-states])
-                           (cond
-                             logged-in?     (rf/dispatch [:navigate-back])
-                             in-onboarding? (rf/dispatch [:navigate-back-to
-                                                          :screen/onboarding.sign-in-intro])
-                             :else          (do
-                                              (rf/dispatch [:navigate-back])
-                                              (debounce/throttle-and-dispatch
-                                               [:open-modal
-                                                :screen/onboarding.sign-in]
-                                               1000))))
-    :accessibility-label :try-again-later-button
-    :customization-color profile-color
-    :container-style     style/try-again-button}
-   (i18n/label :t/try-again)])
+  [profile-color in-onboarding? logged-in? view-id]
+  [rn/view
+   (when-not logged-in?
+     [quo/button
+      {:on-press            #(navigate-to-enter-seed-phrase view-id)
+       :accessibility-label :try-seed-phrase-button
+       :customization-color profile-color
+       :container-style     style/try-again-button}
+      (i18n/label :t/enter-seed-phrase)])
+
+
+   [quo/button
+    {:on-press            (fn []
+                            (rf/dispatch [:syncing/clear-states])
+                            (cond
+                              logged-in?     (rf/dispatch [:navigate-back])
+                              in-onboarding? (rf/dispatch [:navigate-back-to
+                                                           :screen/onboarding.sign-in-intro])
+                              :else          (do
+                                               (rf/dispatch [:navigate-back])
+                                               (debounce/throttle-and-dispatch
+                                                [:open-modal
+                                                 :screen/onboarding.sign-in]
+                                                1000))))
+     :accessibility-label :try-again-later-button
+     :customization-color profile-color
+     :container-style     style/try-again-button}
+    (i18n/label :t/try-again)]])

 (defn view
  [in-onboarding?]
  (let [pairing-status (rf/sub [:pairing/pairing-status])
        profile-color  (:color (rf/sub [:onboarding/profile]))
-        logged-in?     (rf/sub [:multiaccount/logged-in?])]
+        logged-in?     (rf/sub [:multiaccount/logged-in?])
+        view-id        (rf/sub [:view-id])]
    [rn/view {:style (style/page-container in-onboarding?)}
-     (when-not in-onboarding? [background/view true])
+     (when-not in-onboarding?
+       [rn/view {:style style/absolute-fill}
+        [background/view true]])
     [quo/page-nav {:type :no-title :background :blur}]
     [page-title (pairing-progress pairing-status)]
     (if config/show-not-implemented-features?
@@ -63,7 +92,7 @@
          [quo/text "[Error here]"]])
       [rn/view {:flex 1}])
     (when-not (pairing-progress pairing-status)
-       [try-again-button profile-color in-onboarding? logged-in?])]))
+       [try-again-button profile-color in-onboarding? logged-in? view-id])]))

 (defn view-onboarding
  []
@@ -3,6 +3,13 @@
    [quo.foundations.colors :as colors]
    [react-native.reanimated :as reanimated]))

+(def absolute-fill
+  {:position :absolute
+   :top      0
+   :bottom   0
+   :left     0
+   :right    0})
+
 (defn page-container
  [top]
  {:flex             1
@@ -66,7 +66,8 @@
        translate-x  (reanimated/use-shared-value 0)
        window-width (:width (rn/get-window))]
    [rn/view {:style (style/page-container top)}
-     [background/view true]
+     [rn/view {:style style/absolute-fill}
+      [background/view true]]
     [reanimated/view
      {:style (style/content translate-x)}
      [page-title]
@@ -13,14 +13,17 @@
               :value "Default"}
              {:key   :active
               :value "Active"}]}
-   {:key     :action
+   {:key     :dapp
    :type    :select
-    :options [{:key   :none
-               :value "None"}
-              {:key   :icon
-               :value "Icon"}]}
-   {:key  :blur?
-    :type :boolean}])
+    :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}}]}])

 (defn preview
  []
@@ -212,6 +212,7 @@
    [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
@@ -570,6 +571,7 @@
                       {: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}
@@ -0,0 +1,68 @@
+(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}]]))
@@ -124,6 +124,8 @@
              :on-success [:profile.login/node-info-fetched]
              :on-error   #(log/error "node-info: failed error" %)}]]
           [:pairing/get-our-installations]
+           (when (:syncing/installation-id db)
+             [:dispatch [:pairing/finish-seed-phrase-fallback-syncing]])
           (when-not new-account?
             [:dispatch [:universal-links/process-stored-event]])]})))

@@ -2,6 +2,7 @@
  (:require
    [native-module.core :as native-module]
    [status-im.common.emoji-picker.utils :as emoji-picker.utils]
+    [status-im.constants :as constants]
    [status-im.contexts.profile.config :as profile.config]
    status-im.contexts.profile.recover.effects
    [utils.re-frame :as rf]
@@ -17,11 +18,11 @@
         (assoc-in [:syncing :login-sha3-password] login-sha3-password))

     :effects.profile/restore-and-login
-     (merge (profile.config/create)
-            {:displayName        display-name
-             :mnemonic           (security/safe-unmask-data seed-phrase)
-             :password           login-sha3-password
-             :imagePath          (profile.config/strip-file-prefix image-path)
-             :customizationColor color
-             :emoji              (emoji-picker.utils/random-emoji)
-             :fetchBackup        true})}))
+     (assoc (profile.config/create)
+            :displayName        display-name
+            :mnemonic           (security/safe-unmask-data seed-phrase)
+            :password           login-sha3-password
+            :imagePath          (profile.config/strip-file-prefix image-path)
+            :customizationColor (or color constants/profile-default-color)
+            :emoji              (emoji-picker.utils/random-emoji)
+            :fetchBackup        true)}))
@@ -7,6 +7,7 @@
    [react-native.safe-area :as safe-area]
    [status-im.common.floating-button-page.view :as floating-button-page]
    [status-im.contexts.settings.wallet.saved-addresses.add-address-to-save.style :as style]
+    [status-im.contexts.wallet.common.utils :as utils]
    [status-im.contexts.wallet.common.validation :as validation]
    [utils.debounce :as debounce]
    [utils.i18n :as i18n]
@@ -18,20 +19,21 @@

 (defn- validate-input
  [account-addresses saved-addresses user-input]
-  (cond
-    (string/blank? user-input)
-    nil
+  (let [[_ address-without-prefix] (utils/split-prefix-and-address user-input)]
+    (cond
+      (string/blank? user-input)
+      nil

-    (contains? saved-addresses user-input)
-    :existing-saved-address
+      (contains? saved-addresses address-without-prefix)
+      :existing-saved-address

-    (contains? account-addresses user-input)
-    :own-account
+      (contains? account-addresses address-without-prefix)
+      :own-account

-    (not
-     (or (validation/eth-address? user-input)
-         (validation/ens-name? user-input)))
-    :invalid-address-or-ens))
+      (not
+       (or (validation/eth-address? user-input)
+           (validation/ens-name? user-input)))
+      :invalid-address-or-ens)))

 (defn- address-input
  [{:keys [input-value on-change-text paste-into-input clear-input]}]
@@ -93,8 +95,9 @@

 (defn- existing-saved-address
  [{:keys [address]}]
-  (let [{:keys [name customization-color chain-short-names ens ens?]}
-        (rf/sub [:wallet/saved-address-by-address address])]
+  (let [[_ address-without-prefix] (utils/split-prefix-and-address address)
+        {:keys [name customization-color chain-short-names ens ens?]}
+        (rf/sub [:wallet/saved-address-by-address address-without-prefix])]
    [rn/view {:style style/existing-saved-address-container}
     [quo/text
      {:size   :paragraph-1
@@ -105,7 +108,7 @@
      {:blur?           true
       :active-state?   true
       :user-props      {:name                name
-                         :address             (str chain-short-names address)
+                         :address             (str chain-short-names address-without-prefix)
                         :ens                 (when ens? ens)
                         :customization-color customization-color
                         :blur?               true}
@@ -168,20 +171,21 @@
    (rn/use-mount #(rf/dispatch [:wallet/clear-address-to-save]))
    [quo/overlay {:type :shell}
     [floating-button-page/view
-      {:footer-container-padding 0
-       :header                   [quo/page-nav
-                                  {:type                :no-title
-                                   :icon-name           :i/close
-                                   :behind-overlay?     true
-                                   :on-press            navigate-back
-                                   :margin-top          (safe-area/get-top)
-                                   :accessibility-label :add-address-to-save-page-nav}]
-       :footer                   (when (= view-id :screen/settings.add-address-to-save)
-                                   [quo/button
-                                    {:customization-color profile-color
-                                     :disabled?           button-disabled?
-                                     :on-press            on-press-continue}
-                                    (i18n/label :t/continue)])}
+      {:footer-container-padding     0
+       :keyboard-should-persist-taps :handled
+       :header                       [quo/page-nav
+                                      {:type                :no-title
+                                       :icon-name           :i/close
+                                       :behind-overlay?     true
+                                       :on-press            navigate-back
+                                       :margin-top          (safe-area/get-top)
+                                       :accessibility-label :add-address-to-save-page-nav}]
+       :footer                       (when (= view-id :screen/settings.add-address-to-save)
+                                       [quo/button
+                                        {:customization-color profile-color
+                                         :disabled?           button-disabled?
+                                         :on-press            on-press-continue}
+                                        (i18n/label :t/continue)])}
      [quo/page-top
       {:container-style  style/header-container
        :blur?            true
@@ -105,24 +105,25 @@
                         [ens ens? open-network-preferences address-text])]
    [quo/overlay {:type :shell}
     [floating-button-page/view
-      {:footer-container-padding (if edit? (+ (safe-area/get-bottom) 12) 0)
-       :header                   [quo/page-nav
-                                  {:type                :no-title
-                                   :background          :blur
-                                   :icon-name           (if edit? :i/close :i/arrow-left)
-                                   :on-press            navigate-back
-                                   :margin-top          (when-not edit? (safe-area/get-top))
-                                   :accessibility-label :save-address-page-nav}]
-       :footer                   [quo/button
-                                  {:accessibility-label :save-address-button
-                                   :type                :primary
-                                   :customization-color address-color
-                                   :disabled?           (string/blank? address-label)
-                                   :on-press            on-press-save}
-                                  (i18n/label :t/save-address)]
-       :customization-color      address-color
-       :gradient-cover?          true
-       :shell-overlay?           true}
+      {:footer-container-padding     (if edit? (+ (safe-area/get-bottom) 12) 0)
+       :keyboard-should-persist-taps :handled
+       :header                       [quo/page-nav
+                                      {:type                :no-title
+                                       :background          :blur
+                                       :icon-name           (if edit? :i/close :i/arrow-left)
+                                       :on-press            navigate-back
+                                       :margin-top          (when-not edit? (safe-area/get-top))
+                                       :accessibility-label :save-address-page-nav}]
+       :footer                       [quo/button
+                                      {:accessibility-label :save-address-button
+                                       :type                :primary
+                                       :customization-color address-color
+                                       :disabled?           (string/blank? address-label)
+                                       :on-press            on-press-save}
+                                      (i18n/label :t/save-address)]
+       :customization-color          address-color
+       :gradient-cover?              true
+       :shell-overlay?               true}
      [quo/wallet-user-avatar
       {:full-name           (if (string/blank? address-label)
                               placeholder
@@ -0,0 +1,18 @@
+(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)}))
@@ -15,10 +15,7 @@
 (def defaults
  {:filter-status          :unread
   :filter-type            types/no-type
-   ;; 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})
+   :notifications-per-page constants/notifications-per-page})

 ;;;; Navigation

@@ -1,6 +1,7 @@
 (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]
@@ -23,42 +24,50 @@
    :text  (i18n/label :t/decline)}])

 (defn- swipeable
-  [{:keys [active-swipeable notification extra-fn]} child]
-  (let [{:keys [community-id id membership-status]} notification]
+  [{: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])]
    (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
-        :active-swipeable active-swipeable
-        :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
+        :extra-fn       extra-fn}
       child]

      (= membership-status constants/activity-center-membership-status-pending)
      [common/swipeable
-       {: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}
+       {:left-button    swipe-button-accept
+        :left-on-press  accept
+        :right-button   swipe-button-decline
+        :right-on-press decline
+        :extra-fn       extra-fn}
       child]

      :else
      child)))

 (defn view
-  [{:keys [notification set-swipeable-height customization-color] :as props}]
+  [{:keys [notification] :as props}]
  (let [{:keys [author community-id id membership-status
                read timestamp]} notification
-        community                (rf/sub [:communities/community community-id])
-        community-name           (:name community)
-        community-image          (get-in community [:images :thumbnail :uri])]
+        community-name           (rf/sub [:communities/name community-id])
+        community-logo           (rf/sub [:communities/logo community-id])
+        customization-color      (rf/sub [:profile/customization-color])]
    [swipeable props
     [quo/activity-log
      {:title               (i18n/label :t/join-request)
@@ -66,14 +75,13 @@
       :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-image
+                               :community-logo community-logo
                               :community-name community-name}]]
       :items               (condp = membership-status
                              constants/activity-center-membership-status-accepted
@@ -4,6 +4,7 @@

 (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})
@@ -1,10 +1,12 @@
 (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]))
@@ -14,7 +16,7 @@
  (let [profile (rf/sub [:contacts/contact-by-identity user-id])]
    [rn/view
     {:on-start-should-set-responder
-      (fn [_event]
+      (fn []
        (rf/dispatch [:navigate-back])
        (rf/dispatch [:chat.ui/show-profile user-id])
        true)}
@@ -33,35 +35,27 @@
           swipe-button
           swipeable-ref
           style]}]
-  (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)]
+  (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)]
      [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
-                                 (.close ^js @swipeable-ref)
+                                 (oops/ocall @swipeable-ref :close)
                                 (reset! active-swipeable nil))
                               (on-press extra))}
       [swipe-button
        {:style {:opacity   opacity
                 :transform [{:translateX translate-x}]
-                 :height    height
+                 :flex      1
                 :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}
@@ -103,47 +97,54 @@
  (rf/dispatch [:activity-center.notifications/delete (:id notification)]))

 (defn swipeable
-  [_]
-  (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))))
+  [{: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]))
@@ -1,6 +1,7 @@
 (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]
@@ -9,33 +10,34 @@
    [utils.re-frame :as rf]))

 (defn- swipeable
-  [{:keys [active-swipeable extra-fn]} child]
+  [{:keys [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
-    :active-swipeable active-swipeable
-    :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
+    :extra-fn       extra-fn}
   child])

 (defn view
-  [{:keys [notification set-swipeable-height customization-color] :as props}]
-  (let [{:keys [community-id read
+  [{:keys [notification extra-fn]}]
+  (let [{:keys [id community-id read
                timestamp]} notification
        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 [:navigate-back])
-                   (rf/dispatch [:activity-center.notifications/mark-as-read (:id notification)]))}
+        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}
      [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}
@@ -1,6 +1,7 @@
 (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]
@@ -10,27 +11,23 @@
    [utils.re-frame :as rf]))

 (defn- swipeable
-  [{:keys [active-swipeable extra-fn]} child]
+  [{:keys [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
-    :active-swipeable active-swipeable
-    :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
+    :extra-fn       extra-fn}
   child])

 (defn- get-header-text-and-context
-  [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-logo community-name community-permissions membership-status]
+  (let [open?                 (not= 3 (:access community-permissions))
        community-context-tag [quo/context-tag
                               {:type           :community
                                :size           24
                                :blur?          true
-                                :community-logo community-image
+                                :community-logo community-logo
                                :community-name community-name}]]
    (cond
      (= membership-status constants/activity-center-membership-status-idle)
@@ -56,27 +53,33 @@
                                    :t/joined-community
                                    :t/community-request-accepted-body-text)
                                  (when open? {:community community-name}))]
-                     community-context-tag]}
-
-      :else nil)))
+                     community-context-tag]})))

 (defn view
-  [{:keys [notification set-swipeable-height customization-color] :as props}]
+  [{:keys [notification extra-fn]}]
  (let [{:keys [community-id membership-status read
-                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]))}
+                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}
      [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}]]]))
@@ -1,6 +1,7 @@
 (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]
@@ -24,48 +25,52 @@
    :text  (i18n/label :t/decline)}])

 (defn- swipeable
-  [{:keys [active-swipeable extra-fn notification]} child]
+  [{:keys [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)]
+        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])]
    (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
-        :active-swipeable active-swipeable
-        :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
+        :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    #(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}
+       {:left-button    swipe-button-accept
+        :left-on-press  accept
+        :right-button   swipe-button-decline
+        :right-on-press decline
+        :extra-fn       extra-fn}
       child]

      :else
      child)))

 (defn- outgoing-contact-request-view
-  [{:keys [notification set-swipeable-height customization-color]} theme]
+  [{:keys [notification]} theme]
  (let [{:keys [chat-id message last-message accepted]} notification
-        {:keys [contact-request-state] :as message}     (or message last-message)]
+        {:keys [contact-request-state] :as message}     (or message last-message)
+        customization-color                             (rf/sub [:profile/customization-color])]
    (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))
@@ -76,7 +81,6 @@
      [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))
@@ -102,13 +106,22 @@
                               nil)}])))

 (defn- incoming-contact-request-view
-  [{:keys [notification set-swipeable-height customization-color]} theme]
-  (let [{:keys [id author message last-message]} notification
-        message                                  (or message last-message)]
+  [{: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])]
    [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))
@@ -140,13 +153,13 @@
          :key                 :button-decline
          :label               (i18n/label :t/decline)
          :accessibility-label :decline-contact-request
-          :on-press            #(rf/dispatch [:activity-center.contact-requests/decline id])}
+          :on-press            decline}
         {:type                :button
          :subtype             :positive
          :key                 :button-accept
          :label               (i18n/label :t/accept)
          :accessibility-label :accept-contact-request
-          :on-press            #(rf/dispatch [:activity-center.contact-requests/accept id])}]
+          :on-press            accept}]

        nil)}]))

@@ -155,16 +168,16 @@
  (let [{:keys [author message last-message]} notification
        {:keys [public-key]}                  (rf/sub [:multiaccount/contact])
        {:keys [contact-request-state]}       (or message last-message)
-        app-theme                             (rf/sub [:theme])]
+        theme                                 (quo.theme/use-theme)]
    [swipeable props
     (cond
       (= public-key author)
-       [outgoing-contact-request-view props app-theme]
+       [outgoing-contact-request-view props 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 app-theme]]
+        [incoming-contact-request-view props theme]]

       :else
-       [incoming-contact-request-view props app-theme])]))
+       [incoming-contact-request-view props theme])]))
@@ -105,7 +105,7 @@
  (rf/dispatch [:activity-center.notifications/mark-as-read id]))

 (defn- swipeable
-  [{:keys [active-swipeable extra-fn notification replying?] :as props} child]
+  [{:keys [extra-fn notification replying?] :as props} child]
  (let [{:keys [id message
                contact-verification-status]} notification
        challenger?                           (:outgoing message)]
@@ -116,23 +116,21 @@
      (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)
-        :active-swipeable active-swipeable
-        :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)
+        :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)
-        :active-swipeable active-swipeable
-        :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)
+        :extra-fn       extra-fn}
       child]

      (#{constants/contact-verification-status-accepted
@@ -140,12 +138,11 @@
         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
-        :active-swipeable active-swipeable
-        :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
+        :extra-fn       extra-fn}
       child]

      :else
@@ -154,8 +151,9 @@
 (defn view
  [_]
  (let [reply (atom "")]
-    (fn [{:keys [notification set-swipeable-height replying? customization-color] :as props}]
-      (let [{:keys [id message
+    (fn [{:keys [notification replying?] :as props}]
+      (let [customization-color                   (rf/sub [:profile/customization-color])
+            {:keys [id message
                    contact-verification-status]} notification
            challenger?                           (:outgoing message)]
        ;; TODO(@ilmotta): Declined challenges should only be displayed for the challengee, not the
@@ -165,86 +163,84 @@
               (= contact-verification-status constants/contact-verification-status-declined))
          [swipeable props
           [quo/activity-log
-            (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)}])
+            {: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)})]))}]])))))
@@ -1,6 +1,7 @@
 (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]
@@ -33,35 +34,50 @@
    :text  (i18n/label :t/decline)}])

 (defn- swipeable
-  [{:keys [active-swipeable notification extra-fn]} child]
-  (let [{:keys [accepted dismissed id]} notification]
+  [{: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])]
    (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
-        :active-swipeable active-swipeable
-        :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
+        :extra-fn       extra-fn}
       child]
      [common/swipeable
-       {: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}
+       {:left-button    swipe-button-accept
+        :left-on-press  accept
+        :right-button   swipe-button-decline
+        :right-on-press dismiss
+        :extra-fn       extra-fn}
       child])))

 (defn view
-  [{:keys [notification set-swipeable-height customization-color] :as props}]
-  (let [{:keys [id accepted dismissed author read timestamp chat-name chat-id]} notification]
+  [{: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])]
    [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)
@@ -78,13 +94,10 @@
                                 :key                 :button-accept
                                 :label               (i18n/label :t/accept)
                                 :accessibility-label :accept-group-chat-invitation
-                                 :on-press            #(rf/dispatch
-                                                        [:activity-center.notifications/accept id])}
+                                 :on-press            accept}
                                {:type                :button
                                 :subtype             :danger
                                 :key                 :button-decline
                                 :label               (i18n/label :t/decline)
                                 :accessibility-label :decline-group-chat-invitation
-                                 :on-press            #(rf/dispatch
-                                                        [:activity-center.notifications/dismiss
-                                                         id])}])}]]]))
+                                 :on-press            dismiss}])}]]]))
@@ -30,25 +30,24 @@
                       parsed-text-children))))

 (defn- swipeable
-  [{:keys [active-swipeable extra-fn]} child]
+  [{:keys [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
-    :active-swipeable active-swipeable
-    :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
+    :extra-fn       extra-fn}
   child])

 (defn view
-  [{:keys [notification set-swipeable-height customization-color] :as props}]
+  [{:keys [notification extra-fn]}]
  (let [{:keys [author chat-name community-id chat-id
                message read timestamp]} 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])]
-    [swipeable props
+        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}
     [gesture/touchable-without-feedback
      {:on-press (fn []
                   (rf/dispatch [:hide-popover])
@@ -56,7 +55,6 @@
      [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)
@@ -68,7 +66,7 @@
                                 {:type           :channel
                                  :blur?          true
                                  :size           24
-                                  :community-logo community-image
+                                  :community-logo community-logo
                                  :community-name community-name
                                  :channel-name   chat-name}]
                                [quo/context-tag
@@ -51,26 +51,26 @@
    nil))

 (defn- swipeable
-  [{:keys [active-swipeable extra-fn]} child]
+  [{:keys [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
-    :active-swipeable active-swipeable
-    :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
+    :extra-fn       extra-fn}
   child])

 (defn view
-  [{:keys [notification set-swipeable-height customization-color] :as props}]
+  [{:keys [notification extra-fn]}]
  (let [{:keys [author chat-name community-id chat-id
-                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
+                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}
     [gesture/touchable-without-feedback
      {:on-press (fn []
                   (rf/dispatch [:hide-popover])
@@ -78,7 +78,6 @@
      [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)
@@ -89,7 +88,7 @@
                                 {:type           :channel
                                  :blur?          true
                                  :size           24
-                                  :community-logo community-image
+                                  :community-logo community-logo
                                  :community-name community-name
                                  :channel-name   chat-name}]
                                [quo/context-tag
@@ -113,10 +112,7 @@

                                                      (= (:content-type message)
                                                         constants/content-type-gif)
-                                                      :gif
-
-                                                      :else
-                                                      nil)
+                                                      :gif)
                              :body                 (get-message-content message
                                                                         album-messages
                                                                         media-server-port)}}]]]))
@@ -1,9 +1,10 @@
 (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]
@@ -23,61 +24,68 @@
    [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
  []
-  (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)]))))
+  (rf/dispatch [:activity-center.notifications/fetch-next-page]))

 (defn view
  []
-  (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}]]
-        ]))))
+  (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}])]]]))
@@ -117,13 +117,14 @@
 (defn- f-internal-view
  []
  (let [{:keys [keyboard-shown]} (hooks/use-keyboard)]
-    [:<>
-     (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}]]))
+    (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}]))

 (defn view
  []
@@ -46,13 +46,29 @@
  (log/info "[local-pairing] input-connection-string-for-bootstrapping callback"
            {:response res
             :event    :syncing/input-connection-string-for-bootstrapping})
-  (let [error (when (sync-utils/extract-error res)
-                (str "generic-error: " res))]
-    (when (some? error)
+  (let [response        (transforms/json->clj res)
+        installation-id (:installationId response)
+        key-uid         (:keyUID response)
+        error           (:error response)]
+    (when (seq installation-id)
+      (rf/dispatch [:syncing/set-syncing-installation-id installation-id key-uid]))
+    (when (seq error)
      (rf/dispatch [:toasts/upsert
                    {:type :negative
                     :text error}]))))

+(rf/defn initiate-pairing-process
+  {:events [:syncing/initiate-pairing-process]}
+  [{:keys [db]}]
+  {:db (assoc db :syncing/pairing-process-initiated? true)})
+
+(rf/defn set-syncing-installation-id
+  {:events [:syncing/set-syncing-installation-id]}
+  [{:keys [db]} installation-id key-uid]
+  {:db (assoc db
+              :syncing/key-uid         key-uid
+              :syncing/installation-id installation-id)})
+
 (rf/defn preflight-outbound-check-for-local-pairing
  {:events [:syncing/preflight-outbound-check]}
  [_ set-checks-passed]
@@ -96,6 +112,7 @@
                            (when (sync-utils/valid-connection-string? response)
                              (on-valid-connection-string response)
                              (rf/dispatch [:syncing/update-role constants/local-pairing-role-sender])
+                              (rf/dispatch [:syncing/initiate-pairing-process])
                              (rf/dispatch [:hide-bottom-sheet])))]
    (when-not (and error (string/blank? error))
      (let [key-uid    (get-in db [:profile/profile :key-uid])
@@ -346,7 +346,8 @@
                                              #(reset! camera-permission-granted? %)
                                              #(reset! camera-permission-granted? false)))))
        [:<>
-         background
+         [rn/view {:style style/absolute-fill}
+          background]
         (when camera-ready-to-scan?
           [render-camera
            {:torch-mode            torch-mode
@@ -1,18 +0,0 @@
-(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)})
@@ -1,37 +0,0 @@
-(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)}]}]])))
@@ -3,7 +3,6 @@
    [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]
@@ -45,5 +44,4 @@
                      {:title        (i18n/label :t/no-permissions)
                       :description  (i18n/label :t/no-collectibles-description)
                       :placeholder? true}]
-       :dapps        [dapps/view]
       [about/view])]))
@@ -13,13 +13,11 @@

 (def first-tab-id :assets)

-(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})))
+(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- change-tab [id] (rf/dispatch [:wallet/select-account-tab id]))

@@ -69,7 +67,7 @@
      {:style            style/tabs
       :size             32
       :active-tab-id    selected-tab
-       :data             (tabs-data watch-only?)
+       :data             tabs-data
       :on-change        change-tab
       :scrollable?      true
       :scroll-on-press? true}]
@@ -12,13 +12,16 @@
  (hot-reload/use-safe-unmount #(rf/dispatch [:wallet/clean-routes-calculation]))
  [rn/view {:style style/bridge-send-wrapper}
   [input-amount/view
-    {:current-screen-id :screen/wallet.bridge-input-amount
-     :button-one-label  (i18n/label :t/review-bridge)
-     :button-one-props  {:icon-left :i/bridge}
-     :on-confirm        (fn [amount]
-                          (rf/dispatch [:wallet/set-token-amount-to-bridge
-                                        {:amount   amount
-                                         :stack-id :screen/wallet.bridge-input-amount}]))
-     :on-navigate-back  (fn []
-                          (rf/dispatch [:wallet/clean-disabled-from-networks])
-                          (rf/dispatch [:wallet/clean-send-amount]))}]])
+    {:current-screen-id      :screen/wallet.bridge-input-amount
+     :button-one-label       (i18n/label :t/review-bridge)
+     :button-one-props       {:icon-left :i/bridge}
+     :enabled-from-chain-ids (rf/sub
+                              [:wallet/bridge-from-chain-ids])
+     :from-enabled-networks  (rf/sub [:wallet/bridge-from-networks])
+     :on-confirm             (fn [amount]
+                               (rf/dispatch [:wallet/set-token-amount-to-bridge
+                                             {:amount   amount
+                                              :stack-id :screen/wallet.bridge-input-amount}]))
+     :on-navigate-back       (fn []
+                               (rf/dispatch [:wallet/clean-disabled-from-networks])
+                               (rf/dispatch [:wallet/clean-send-amount]))}]])
@@ -28,17 +28,6 @@
      (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)))
@@ -160,6 +160,9 @@
            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
@@ -182,10 +185,7 @@
                                            :image-height 300
                                            :id           token-id
                                            :header       collectible-name
-                                            :description  collection-name}
-            total-owned                    (utils/total-owned-collectible
-                                            (:ownership collectible)
-                                            (:address collectible-owner))]
+                                            :description  collection-name}]
        [rn/view {:style style/container}
         [rn/view
          [gradient-layer preview-uri]
@@ -7,7 +7,8 @@
    [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.i18n :as i18n]
+    [utils.re-frame :as rf]))

 (defn- collectible-item
  [{:keys [preview-url collection-data collectible-data total-owned on-press on-long-press]
@@ -61,15 +62,16 @@
      ;; 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}]
-                                             (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)]
+      (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)]
        [rn/flat-list
         {:data                     collectibles-data
          :style                    {:flex 1}
@@ -16,14 +16,14 @@
   :right-icon          :i/external})

 (defn- action-send
-  [send-params]
+  [send-params entry-point]
  {: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]))})
+                          (rf/dispatch [:wallet/set-token-to-send send-params entry-point]))})

 (defn- action-receive
  [selected-account?]
@@ -66,36 +66,41 @@
   :on-press            #(js/alert "to be implemented")})

 (defn token-value-drawer
-  [token watch-only?]
+  [token watch-only? entry-point]
  (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}
+                                 :start-flow? true
+                                 :owners      token-owners}
                                {:token-symbol token-symbol
                                 :stack-id     :wallet-stack
-                                 :start-flow?  true})]
+                                 :start-flow?  true
+                                 :owners       token-owners})]
    [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)
-                                   (action-send send-or-bridge-params)
+                                   (when (seq token-owners)
+                                     (action-send send-or-bridge-params entry-point))
                                   (action-receive selected-account?)
                                   (when (ff/enabled? ::ff/wallet.swap) (action-swap))
-                                   (action-bridge send-or-bridge-params)]))]]))
+                                   (when (seq (seq token-owners))
+                                     (action-bridge send-or-bridge-params))]))]]))

 (defn view
-  [item _ _ {:keys [watch-only?]}]
+  [item _ _ {:keys [watch-only? entry-point]}]
  [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?])
+               {:content       (fn [] [token-value-drawer item watch-only? entry-point])
                :selected-item (fn [] [quo/token-value item])}])))])
@@ -307,10 +307,14 @@
                                                    :color           color
                                                    :currency        currency
                                                    :currency-symbol currency-symbol}))
-        calculated-tokens (map calculate-token tokens)
-        token-priority    {"SNT" 1 "STT" 1 "ETH" 2 "DAI" 3}]
+        calculated-tokens (map calculate-token tokens)]
    (sort-by (fn [token]
               (let [fiat-value (get-in token [:values :fiat-unformatted-value])
-                     priority   (get token-priority (:token token) 999)]
+                     priority   (get constants/token-sort-priority (:token token) ##Inf)]
                 [(- 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)))
@@ -172,17 +172,20 @@

 (defn get-network-details
  [chain-id]
-  (condp contains? chain-id
-    #{constants/ethereum-mainnet-chain-id constants/ethereum-goerli-chain-id
-      constants/ethereum-sepolia-chain-id}
-    mainnet-network-details
+  (as-> chain-id $
+    (condp contains? $
+      #{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))
+      nil)
+    (when $
+      (assoc $ :chain-id chain-id))))
@@ -149,5 +149,14 @@
                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)))))
+


@@ -9,8 +9,10 @@
    [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.re-frame :as rf]
+    [utils.string]))

 (defn- on-disconnect
  [wallet-account {:keys [name topic]}]
@@ -19,7 +21,6 @@
   [: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
@@ -83,15 +84,17 @@
  []
  (let [{:keys [bottom]}                   (safe-area/get-insets)
        {:keys [color] :as wallet-account} (rf/sub [:wallet/current-viewing-account])
-        pairings                           (rf/sub [:wallet-connect/pairings])
-        theme                              (quo.theme/use-theme)]
+        sessions                           (rf/sub
+                                            [:wallet-connect/sessions-for-current-account])
+        theme                              (quo.theme/use-theme)
+        customization-color                (rf/sub [:profile/customization-color])]
    [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? pairings)
+     (if (empty? sessions)
       [quo/empty-state
        {:title           (i18n/label :t/no-dapps)
         :description     (i18n/label :t/no-dapps-description)
@@ -99,16 +102,18 @@
         :container-style style/empty-container-style}]
       [rn/view (style/dapps-container bottom)
        [rn/flat-list
-         {:data                    pairings
+         {:data                    sessions
          :always-bounce-vertical  false
          :content-container-style (style/dapps-list theme)
-          :render-fn               (fn [{:keys                    [topic]
-                                         {:keys [icons name url]} :peerMetadata}]
+          :render-fn               (fn [{:keys [topic pairingTopic name url iconUrl]}]
                                     [quo/dapp
-                                      {:dapp                {:avatar (get icons 0)
-                                                             :name   name
-                                                             :value  url
-                                                             :topic  topic}
+                                      {: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}
                                       :accessibility-label (str "dapp-" topic)
                                       :state               :default
                                       :action              :icon
@@ -1,7 +1,6 @@
 (ns status-im.contexts.wallet.data-store-test
  (:require
    [cljs.test :refer-macros [deftest is testing]]
-    [matcher-combinators.matchers :as matchers]
    matcher-combinators.test
    [status-im.contexts.wallet.data-store :as sut]))

@@ -162,82 +161,73 @@
 (deftest reconcile-keypairs-test
  (testing "reconcile-keypairs represents updated key pairs and accounts"
    (is
-     (match?
-      (matchers/match-with
-       [set? matchers/set-equals
-        map? matchers/equals]
-       {:removed-keypair-ids         #{}
-        :removed-account-addresses   #{}
-        :updated-accounts-by-address {"1x123" (merge account
-                                                     {:key-uid "0x123"
-                                                      :address "1x123"})
-                                      "1x456" (merge account
-                                                     {:key-uid   "0x456"
-                                                      :address   "1x456"
-                                                      :operable? false
-                                                      :operable  :no})}
-        :updated-keypairs-by-id      {"0x123" {:key-uid            "0x123"
-                                               :type               :seed
-                                               :lowest-operability :fully
-                                               :accounts           [(merge account
-                                                                           {:key-uid "0x123"
-                                                                            :address "1x123"})]}
-                                      "0x456" {:key-uid            "0x456"
-                                               :type               :key
-                                               :lowest-operability :no
-                                               :accounts           [(merge account
-                                                                           {:key-uid   "0x456"
-                                                                            :address   "1x456"
-                                                                            :operable? false
-                                                                            :operable  :no})]}}})
+     (match-strict?
+      {:removed-keypair-ids         #{}
+       :removed-account-addresses   #{}
+       :updated-accounts-by-address {"1x123" (merge account
+                                                    {:key-uid "0x123"
+                                                     :address "1x123"})
+                                     "1x456" (merge account
+                                                    {:key-uid   "0x456"
+                                                     :address   "1x456"
+                                                     :operable? false
+                                                     :operable  :no})}
+       :updated-keypairs-by-id      {"0x123" {:key-uid            "0x123"
+                                              :type               :seed
+                                              :lowest-operability :fully
+                                              :accounts           [(merge account
+                                                                          {:key-uid "0x123"
+                                                                           :address "1x123"})]}
+                                     "0x456" {:key-uid            "0x456"
+                                              :type               :key
+                                              :lowest-operability :no
+                                              :accounts           [(merge account
+                                                                          {:key-uid   "0x456"
+                                                                           :address   "1x456"
+                                                                           :operable? false
+                                                                           :operable  :no})]}}}
      (sut/reconcile-keypairs [raw-keypair-seed-phrase
                               raw-keypair-private-key]))))
  (testing "reconcile-keypairs represents removed key pairs and accounts"
    (is
-     (match?
-      (matchers/match-with
-       [set? matchers/set-equals
-        map? matchers/equals]
-       {:removed-keypair-ids         #{"0x456"}
-        :removed-account-addresses   #{"1x456"}
-        :updated-accounts-by-address {"1x123" (merge account
-                                                     {:key-uid "0x123"
-                                                      :address "1x123"})}
-        :updated-keypairs-by-id      {"0x123" {:key-uid            "0x123"
-                                               :type               :seed
-                                               :lowest-operability :fully
-                                               :accounts           [(merge account
-                                                                           {:key-uid "0x123"
-                                                                            :address "1x123"})]}}})
+     (match-strict?
+      {:removed-keypair-ids         #{"0x456"}
+       :removed-account-addresses   #{"1x456"}
+       :updated-accounts-by-address {"1x123" (merge account
+                                                    {:key-uid "0x123"
+                                                     :address "1x123"})}
+       :updated-keypairs-by-id      {"0x123" {:key-uid            "0x123"
+                                              :type               :seed
+                                              :lowest-operability :fully
+                                              :accounts           [(merge account
+                                                                          {:key-uid "0x123"
+                                                                           :address "1x123"})]}}}
      (sut/reconcile-keypairs [raw-keypair-seed-phrase
                               (assoc raw-keypair-private-key :removed true)]))))
  (testing "reconcile-keypairs ignores chat accounts inside updated accounts"
    (is
-     (match?
-      (matchers/match-with
-       [set? matchers/set-equals
-        map? matchers/equals]
-       {:removed-keypair-ids         #{}
-        :removed-account-addresses   #{}
-        :updated-accounts-by-address {"2x000" (merge account
-                                                     {:key-uid          "0x000"
-                                                      :address          "2x000"
-                                                      :chat             false
-                                                      :wallet           true
-                                                      :default-account? true})}
-        :updated-keypairs-by-id      {"0x000" {:key-uid            "0x000"
-                                               :type               :profile
-                                               :lowest-operability :fully
-                                               :accounts           [(merge account
-                                                                           {:key-uid          "0x000"
-                                                                            :address          "1x000"
-                                                                            :chat             true
-                                                                            :wallet           false
-                                                                            :default-account? false})
-                                                                    (merge account
-                                                                           {:key-uid          "0x000"
-                                                                            :address          "2x000"
-                                                                            :chat             false
-                                                                            :wallet           true
-                                                                            :default-account? true})]}}})
+     (match-strict?
+      {:removed-keypair-ids         #{}
+       :removed-account-addresses   #{}
+       :updated-accounts-by-address {"2x000" (merge account
+                                                    {:key-uid          "0x000"
+                                                     :address          "2x000"
+                                                     :chat             false
+                                                     :wallet           true
+                                                     :default-account? true})}
+       :updated-keypairs-by-id      {"0x000" {:key-uid            "0x000"
+                                              :type               :profile
+                                              :lowest-operability :fully
+                                              :accounts           [(merge account
+                                                                          {:key-uid          "0x000"
+                                                                           :address          "1x000"
+                                                                           :chat             true
+                                                                           :wallet           false
+                                                                           :default-account? false})
+                                                                   (merge account
+                                                                          {:key-uid          "0x000"
+                                                                           :address          "2x000"
+                                                                           :chat             false
+                                                                           :wallet           true
+                                                                           :default-account? true})]}}}
      (sut/reconcile-keypairs [raw-keypair-profile])))))
@@ -65,10 +65,21 @@
   {:db (assoc-in db [:wallet :current-viewing-account-address] address)}))

 (rf/reg-event-fx :wallet/clean-current-viewing-account
- (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)}))))
+ (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))})))

 (rf/reg-event-fx :wallet/close-account-page
 (fn [{:keys [db]}]
@@ -18,4 +18,5 @@
      [rn/flat-list
       {:render-fn               token-value/view
        :data                    tokens
+        :render-data             {:entry-point :wallet-stack}
        :content-container-style style/list-container}])))
@@ -21,7 +21,7 @@

 (defn view
  [{:keys [selected-tab]}]
-  (let [collectible-list     (rf/sub [:wallet/all-collectibles-list-in-selected-networks])
+  (let [collectible-list     (rf/sub [:wallet/owned-collectibles-list-in-selected-networks])
        request-collectibles #(rf/dispatch
                               [:wallet/request-collectibles-for-all-accounts {}])]
    [rn/view {:style style/container}
@@ -187,38 +187,41 @@
 (rf/reg-event-fx
 :wallet/update-receiver-networks
 (fn [{:keys [db]} [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))
+   (let [amount (get-in db [:wallet :ui :send :amount])]
+     {:db (assoc-in db [:wallet :ui :send :receiver-networks] selected-networks)
      :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?]}]]
+ (fn [{:keys [db]} [{:keys [token-symbol token stack-id start-flow? owners]} entry-point]]
   ;; `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 [{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)
+   (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)
       {:db (cond-> db
-              :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))
+              :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))
        :fx [[:dispatch [:wallet/clean-suggested-routes]]
             [:dispatch
              [:wallet/wizard-navigate-forward
@@ -232,9 +235,9 @@
   (let [{token-networks :networks
          token-symbol   :symbol}                  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 (some (set receiver-networks)
-                                                              token-networks-ids))]
+         token-networks-ids                        (map :chain-id token-networks)
+         token-not-supported-in-receiver-networks? (not-any? (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)
@@ -263,7 +266,9 @@
 (rf/reg-event-fx
 :wallet/set-collectible-to-send
 (fn [{db :db} [{:keys [collectible current-screen start-flow?]}]]
-   (let [collection-data    (:collection-data collectible)
+   (let [viewing-account?   (some? (-> db :wallet :current-viewing-account-address))
+         entry-point        (when-not viewing-account? :wallet-stack)
+         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)
@@ -278,6 +283,7 @@

                              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)
@@ -285,7 +291,14 @@
                                (assoc-in [:wallet :ui :send :tx-type] tx-type))
         recipient-set?     (-> db :wallet :ui :send :recipient)]
     {:db (cond-> collectible-tx
-            one-collectible? (assoc-in [:wallet :ui :send :amount] 1))
+            :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))
      :fx [(when (and one-collectible? recipient-set?)
             [:dispatch [:wallet/get-suggested-routes {:amount 1}]])
           [:dispatch
@@ -23,19 +23,6 @@
          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
@@ -42,7 +42,6 @@
                                 {: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}]
@@ -120,7 +120,7 @@
  []
  [quo/alert-banner
   {:action?         true
-    :text            (i18n/label :t/not-enough-assets)
+    :text            (i18n/label :t/not-enough-assets-to-pay-gas-fees)
    :button-text     (i18n/label :t/buy-eth)
    :on-button-press #(rf/dispatch [:show-bottom-sheet
                                    {:content buy-token/view}])}])
@@ -146,6 +146,8 @@
    button-one-props         :button-one-props
    current-screen-id        :current-screen-id
    initial-crypto-currency? :initial-crypto-currency?
+    enabled-from-chain-ids   :enabled-from-chain-ids
+    from-enabled-networks    :from-enabled-networks
    :or                      {initial-crypto-currency? true}}]
  (let [_ (rn/dismiss-keyboard!)
        bottom                                      (safe-area/get-bottom)
@@ -164,9 +166,6 @@
         token-decimals :decimals
         :as
         token}                                     (rf/sub [:wallet/wallet-send-token])
-        send-enabled-networks                       (rf/sub [:wallet/wallet-send-enabled-networks])
-        enabled-from-chain-ids                      (rf/sub
-                                                     [:wallet/wallet-send-enabled-from-chain-ids])
        send-from-locked-amounts                    (rf/sub [:wallet/wallet-send-from-locked-amounts])
        {token-balance     :total-balance
         available-balance :available-balance
@@ -355,7 +354,7 @@
       :currency-symbol  currency-symbol
       :crypto-decimals  (min token-decimals 6)
       :error?           (controlled-input/input-error input-state)
-       :networks         (seq send-enabled-networks)
+       :networks         (seq from-enabled-networks)
       :title            (i18n/label
                          :t/send-limit
                          {:limit (if crypto-currency?
@@ -429,3 +428,4 @@
                               (set-just-toggled-mode? false)
                               (set-input-state controlled-input/delete-all)
                               (rf/dispatch [:wallet/clean-suggested-routes]))}]]))
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
frank	9a9ad0ccea	feat!:enable sync fallback	2024-08-01 17:10:23 +08:00
Parvesh Monu	a8a08c82b0	fix styling and navigation	2024-07-25 16:05:05 +05:30
Parvesh Monu	aa28678188	lint and status-go update https://github.com/status-im/status-go/compare/4a43b2b2...c39d9dc2	2024-07-25 15:11:58 +05:30
Parvesh Monu	67aa733736	Implement seed phrase fallback flow	2024-07-25 14:35:38 +05:30
Lungu Cristian	cee21241d4	WalletConnect no internet edge-cases (#20826 ) * feat: only initialize wc if internet online * feat: no internet toast for session establishment * feat: no internet banner on session requests * feat: reloading walletconnect on connection change * fix: re-initialize only when previously failed to * fix: removed legacy net-info ns * ref: renamed :network-status to :network/status * ref: moved network subs to own "category" * fix: device network fx args * fix: tests & showing persisted dapps when offline * fix: addressed review comments * fix: rebase issues * fix: linting * fix: usage of web3-wallet (#20864) * fix: moved networks to contextx and renaming * ref: moved building supported namespaces into fx	2024-07-25 11:21:31 +03:00
Icaro Motta	60ad7c8a29	chore(tests): New match-strict? cljs.test directive (#20825 ) Equality checks in tests using = give a bad experience by default on test failures containing nested data structures. We use the cljs.test directive match? from matcher-combinators library to help compare nested structures. The problem with match? is that its default matcher for maps (embeds) can be too permissive, and this causes surprises. Here we upgrade matcher-combinators to latest, where a new matcher called nested-equals is available. This matcher won't allow extra keys in maps. This matcher eliminates the need for manually adding nested equals matchers as we have to do currently. - Upgrades matcher-combinators from 3.8.8 to 3.9.1 (latest as of 2024-07-19) What changes? When asserting in tests, we now have the option to use match-strict? or match?. Both directives are available by integrating with cljs.test. The code implementing the new match-strict? directive was 100% copied from the library matcher-combinators because we need to wrap the expected value ourselves with matcher-combinators.matchers/nested-equals. It's ugly code, but it's how we can integrate with cljs.test/assert-expr.	2024-07-24 23:06:41 -03:00
Mohamed Javid	4989c92780	fix_: Adding own address as saved addresses (#20839 ) This commit: - prevents the user from saving their wallet address as the saved address - fixes button not capturing taps when the keyboard is open in saved address flows Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2024-07-24 19:46:59 +05:30
Lungu Cristian	c6a63e30b2	fix: usage of web3-wallet (#20864 )	2024-07-24 13:54:30 +03:00
Lungu Cristian	07005f8ad5	Reject typeddata request when wrong chainId inside typed data (#20821 ) * fix: reject typeddata request if wrong chainid * fix: lint	2024-07-24 12:12:40 +03:00
Jamie Caprani	3ab345563c	fix(wallet): adjust max amount to not include network being bridged to (#20604 )	2024-07-24 01:54:12 -07:00
Icaro Motta	cef1308b3a	chore(tests): Allow test-watch-for-repl target to run while the app is running (#20827 ) Fix a long standing problem where we can't run in parallel the make target run-clojure and test-watch-for-repl, or in other words, we can't run tests via the REPL while the app is running. Details: I found out that shadow-cljs fails to build because it does not expand the environment variables SHADOW_OUTPUT_TO and SHADOW_NS_REGEXP if and only if the run-clojure target was executed. This is the top of the stacktrace, and it happens because it doesn't know where to output the test build because the env var wasn't expanded: [build] NullPointerException: [build] shadow.build.node/configure (node.clj:59) [build] shadow.build.node/configure (node.clj:45) [build] shadow.build.targets.node-script/configure (node_script.clj:37) The solution is to pass the option --config-merge to shadow-cljs and override both :ns-regexp and :output-to because CLI args override options from env vars in shadow-cljs.	2024-07-24 00:18:27 -03:00
Icaro Motta	4b8a612df4	chore(docs): Document some of our existing testing practices (#20691 ) Document some of our current testing practices in hopes of helping reduce friction in PRs and communication in general. In theory, nothing in the text should be a surprise because these are things we have been discussing over many months (some things for almost 1.5 years) and are already present in the code.	2024-07-23 23:45:14 -03:00
Ulises Manuel	e4639c153f	feat(wallet): Skip From page while sending an asset only owned by one account (#20773 ) - Update tests - Omit from page while sending a token in home page - Hide send and bridge option for not owned tokens - Fix subscription to return accounts owning an asset	2024-07-23 16:08:33 -06:00
Alexander	8597b899bd	Remove dApps tab from Wallet (#20818 )	2024-07-23 18:57:27 +03:00
John Ngei	a5c8182461	fix onboarding navigation to enable notification screen and blur issues (#20725 )	2024-07-23 15:18:43 +02:00
mmilad75	89bb3ea5c3	Watch-only collectibles should not be included on the main wallet page by default #20735 (#20761 )	2024-07-23 14:45:02 +02:00
Shivek Khurana	3bb7c308e3	🦁 Fix issues with missing dapp images and dapp names (#20811 ) * 🦁 Beast mode * 🗑️ Remove `prn` calls * 🌎 Add utils to remove http:// prefix * ⏭️ Extracted name and avatar computation * 🧹 Cleanup * ✏️ Fix lint and remove REPL flow * ❌ Remove broken test * 🖊️ Fix lint	2024-07-23 17:04:03 +05:30
Parvesh Monu	1a4987478c	fix UI elements are misplaced on the 'Sign in by syncing' screen when adding a new profile (#20837 )	2024-07-23 16:09:04 +05:30
Parvesh Monu	540094c229	fix Missing 'Mark as read' option on community channels (#20838 )	2024-07-22 22:55:50 +05:30
Alexander	08b65cbcb7	Proper handling of disconnection, both from the dapp itself and from the list of connected dapps (#20817 )	2024-07-22 15:20:52 +02:00
AlexanderandLungu Cristian	d623cc8444	Only show the Wallet Connect requests for the logged in user (#20815 ) Co-authored-by: Lungu Cristian <lungucristian95@gmail.com>	2024-07-22 14:57:45 +02:00
Brian Sztamfater	4b7c906df2	feat(swap): set spending cap screen (#20727 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2024-07-22 08:50:29 -03:00
Omar Basem	3b446963ef	fix: assets sort order on bridge and assets screen (#20813 ) * fix: assets sort order on bridge and assets screen (#20813)	2024-07-22 14:16:40 +04:00
Icaro Motta	cec46f985a	chore(style): Sort JSON keys in translations/en.json (#20785 ) Sorts keys (non-recursively) in translations/en.json. The solution uses the prettier plugin https://github.com/Gudahtt/prettier-plugin-sort-json. We only format translations/en.json because it’s the only file we need to manually change. - Dependency added: prettier-plugin-sort-json version 4.0.0 - Dependency upgraded: prettier, from version 2.8.8 to 3.3.3.	2024-07-21 22:39:50 -03:00
Volodymyr Kozieiev	06b2996167	Do not update disabled networks when receiver network updated (#20756 )	2024-07-19 15:10:13 +01:00
Lungu Cristian	02e24208db	Wallet Connect transactions (#20755 ) * feat: updated signing endpoints and refactor https://github.com/status-im/status-go/compare/6e056348...e8aec741 * fix: using the generic warning at the bottom * fix: show parsed transaction parameters * feat: adding fees to transactions https://github.com/status-im/status-go/compare/6e056348...b2e5e7a8 * feat: added fees * feat: added eip-1559 fee estimation & tx priority * feat: added fees and failed processing handling * fix: show testnet name in the request * fix: address review comments * feat: added max-fee color when not enough balance * ref: broke down tx fees subscription * fix: handle gas estimation on status-go https://github.com/status-im/status-go/compare/1ef2434b...5389f281 * fix: don't overwrite dynamic fees if already there * fix: malli schema and review comments * fix: addressed review comments 1 * fix: addressed comments 2 * fix: removed unused require * fix: addressed QA review https://github.com/status-im/status-go/compare/484b8aca...d07f9b5b * fix: requests being shown simultaneously * fix: removed support for eth_signTransaction	2024-07-19 14:16:51 +03:00
frank	84b8943fd4	fix_:still return the image when image server is unable to get public key (#20538 ) https://github.com/status-im/status-go/compare/cba3ac57...4a43b2b2	2024-07-19 17:17:53 +08:00
Ajay Sivan	c52b3e457e	Wallet/Swap Input Component (#20318 )	2024-07-19 01:00:38 -07:00
Omar Basem	21cc8a199a	fix: button width (#20792 ) * fix: button width (#20792)	2024-07-19 08:13:50 +04:00
Yevheniia Berdnyk	59374543ef	e2e: disabled activity verification in wallet tests	2024-07-18 19:45:20 +03:00
Alexander	9f84a7b912	A pack of bugfixes for the user story "Connect to dApps" (#20711 )	2024-07-18 14:57:53 +02:00
Vit∀ly Vlasov	2b0847ef76	fix_: ui part for share-all-future-addresses storage (PR #20549 ) (#20549 ) Related status-go PR: https://github.com/status-im/status-go/pull/5354 https://github.com/status-im/status-go/compare/6e056348...8458cafe Signed-off-by: Vitaly Vlasov <mail@vitv.ly>	2024-07-18 15:36:38 +03:00
Yevheniia Berdnyk	97b19c5440	e2e: fixes for wallet and deep/universal links tests	2024-07-18 00:52:06 +03:00
Icaro Motta	b3e88508ac	chore(activity-center): Various small refactors (#20690 ) Potentially a solution to https://github.com/status-im/status-mobile/issues/15706 - [x] Fixes swipe button on Android and iOS. - [x] Performance: we now subscribe only to the minimum from each community. This could be the reason the AC would lag as described in the parent issue. - [x] Performance: was able to use flex and removed swipe button height calculation that was using `onLayout` and was causing a re-render. - [x] Performance: reduced the initial number of items to render in the flatlist from 10 to 7. - [x] Performance: delay rendering the heavy list of notification components. See in the video below how slow it is to open the AC with just 6 notifications and that the opening animation is never displayed. And then check the improved version with the artificial delay provided by `rn/delay-render`. By opening the AC first and animating, this gives the user something to look for, and hopefully a few milliseconds more to think the app is not stuck, which will be preciously used to render notifications. We refactor all views in the AC to: - [x] Follow our newest standards with React hooks. - [x] Removed prop-drilling by creating a separate React context to store the current swipeable item (because we need to call `.close` on a `Gesture Swipeable` instance whenever a new swipeable opens.	2024-07-17 12:16:06 -03:00