🎏 Add ff for wc scanner

- Bring back missing event
status-im · Jun 5, 2024 · 54addc4 · 54addc4
1 parent aab6b3a
commit 54addc4
Show file tree

Hide file tree

Showing 3 changed files with 150 additions and 115 deletions.
diff --git a/src/status_im/contexts/shell/qr_reader/view.cljs b/src/status_im/contexts/shell/qr_reader/view.cljs
@@ -8,6 +8,7 @@
             [status-im.contexts.communities.events]
             [status-im.contexts.wallet.common.validation :as wallet-validation]
             [status-im.contexts.wallet.wallet-connect.utils :as wc-utils]
+            [status-im.feature-flags :as ff]
             [utils.debounce :as debounce]
             [utils.ethereum.eip.eip681 :as eip681]
             [utils.i18n :as i18n]
@@ -102,7 +103,9 @@
     ;; TODO: https://github.com/status-im/status-mobile/issues/18744
     nil
 
-    (wc-utils/valid-uri? scanned-text)
+    (and
+     (wc-utils/valid-uri? scanned-text)
+     (ff/enabled? ::ff/wallet.wallet-connect))
     (handle-wallet-connect scanned-text)
 
     (url? scanned-text)

diff --git a/src/status_im/contexts/wallet/wallet_connect/events.cljs b/src/status_im/contexts/wallet/wallet_connect/events.cljs
@@ -1,12 +1,15 @@
 (ns status-im.contexts.wallet.wallet-connect.events
   (:require [re-frame.core :as rf]
+            [react-native.wallet-connect :as wallet-connect]
             [status-im.constants :as constants]
             [status-im.contexts.wallet.wallet-connect.core :as wallet-connect-core]
             status-im.contexts.wallet.wallet-connect.effects
             status-im.contexts.wallet.wallet-connect.processing-events
             status-im.contexts.wallet.wallet-connect.responding-events
+            [status-im.contexts.wallet.wallet-connect.utils :as wc-utils]
             [taoensso.timbre :as log]
-            [utils.ethereum.chain :as chain]))
+            [utils.ethereum.chain :as chain]
+            [utils.i18n :as i18n]))
 
 (rf/reg-event-fx
  :wallet-connect/init
@@ -155,3 +158,32 @@
                                                  :event :wallet-connect/approve-session})
                                      (rf/dispatch
                                       [:wallet-connect/reset-current-session-proposal]))}]]})))
+
+(rf/reg-event-fx
+ :wallet-connect/on-scan-connection
+ (fn [_ [scanned-text]]
+   (let [parsed-uri         (wallet-connect/parse-uri scanned-text)
+         version            (:version parsed-uri)
+         expired?           (-> parsed-uri
+                                :expiryTimestamp
+                                wc-utils/timestamp-expired?)
+         version-supported? (wc-utils/version-supported? version)]
+     (cond
+       expired?
+       {:fx [[:dispatch
+              [:toasts/upsert
+               {:type  :negative
+                :theme :dark
+                :text  (i18n/label :t/wallet-connect-qr-expired)}]]]}
+
+       (not version-supported?)
+       {:fx [[:dispatch
+              [:toasts/upsert
+               {:type  :negative
+                :theme :dark
+                :text  (i18n/label :t/wallet-connect-version-not-supported
+                                   {:version version})}]]]}
+
+       :else
+       {:fx [[:dispatch [:wallet-connect/pair scanned-text]]
+             [:dispatch [:dismiss-modal :screen/wallet.wallet-connect-session-proposal]]]}))))
diff --git a/src/status_im/navigation/screens.cljs b/src/status_im/navigation/screens.cljs
@@ -1,118 +1,118 @@
 (ns status-im.navigation.screens
   (:require
-   [legacy.status-im.ui.screens.screens :as old-screens]
-   [quo.foundations.colors :as colors]
-   [status-im.common.emoji-picker.view :as emoji-picker]
-   [status-im.common.enter-seed-phrase.view :as enter-seed-phrase]
-   [status-im.common.lightbox.view :as lightbox]
-   [status-im.config :as config]
-   [status-im.contexts.chat.group-create.view :as group-create]
-   [status-im.contexts.chat.group-details.view :as group-details]
-   [status-im.contexts.chat.home.add-new-contact.scan.scan-profile-qr-page :as scan-profile-qr-page]
-   [status-im.contexts.chat.home.add-new-contact.views :as add-new-contact]
-   [status-im.contexts.chat.home.new-chat.view :as new-chat]
-   [status-im.contexts.chat.messenger.camera.view :as camera-screen]
-   [status-im.contexts.chat.messenger.messages.view :as chat]
-   [status-im.contexts.chat.messenger.photo-selector.view :as photo-selector]
-   [status-im.contexts.communities.actions.accounts-selection.view :as communities.accounts-selection]
-   [status-im.contexts.communities.actions.addresses-for-permissions.view :as
-    addresses-for-permissions]
-   [status-im.contexts.communities.actions.airdrop-addresses.view :as airdrop-addresses]
-   [status-im.contexts.communities.actions.channel-view-details.view :as
-    channel-view-channel-members-and-details]
-   [status-im.contexts.communities.actions.invite-contacts.view :as communities.invite]
-   [status-im.contexts.communities.actions.request-to-join.view :as join-menu]
-   [status-im.contexts.communities.actions.share-community-channel.view :as share-community-channel]
-   [status-im.contexts.communities.actions.share-community.view :as share-community]
-   [status-im.contexts.communities.discover.view :as communities.discover]
-   [status-im.contexts.communities.overview.view :as communities.overview]
-   [status-im.contexts.onboarding.create-password.view :as create-password]
-   [status-im.contexts.onboarding.create-profile.view :as create-profile]
-   [status-im.contexts.onboarding.enable-biometrics.view :as enable-biometrics]
-   [status-im.contexts.onboarding.enable-notifications.view :as enable-notifications]
-   [status-im.contexts.onboarding.generating-keys.view :as generating-keys]
-   [status-im.contexts.onboarding.identifiers.view :as identifiers]
-   [status-im.contexts.onboarding.intro.view :as intro]
-   [status-im.contexts.onboarding.new-to-status.view :as new-to-status]
-   [status-im.contexts.onboarding.sign-in.view :as sign-in]
-   [status-im.contexts.onboarding.syncing.progress.view :as syncing-devices]
-   [status-im.contexts.onboarding.syncing.results.view :as syncing-results]
-   [status-im.contexts.onboarding.welcome.view :as welcome]
-   [status-im.contexts.preview.feature-flags.view :as feature-flags]
-   [status-im.contexts.preview.quo.component-preview.view :as component-preview]
-   [status-im.contexts.preview.quo.main :as quo.preview]
-   [status-im.contexts.preview.status-im.main :as status-im-preview]
-   [status-im.contexts.profile.contact.share.view :as share-contact]
-   [status-im.contexts.profile.contact.view :as contact-profile]
-   [status-im.contexts.profile.edit.accent-colour.view :as edit-accent-colour]
-   [status-im.contexts.profile.edit.bio.view :as edit-bio]
-   [status-im.contexts.profile.edit.name.view :as edit-name]
-   [status-im.contexts.profile.edit.view :as edit-profile]
-   [status-im.contexts.profile.profiles.view :as profiles]
-   [status-im.contexts.profile.settings.screens.messages.blocked-users.view :as
-    settings.blocked-users]
-   [status-im.contexts.profile.settings.screens.messages.view :as settings.messages]
-   [status-im.contexts.profile.settings.screens.password.change-password.loading :as
-    change-password-loading]
-   [status-im.contexts.profile.settings.screens.password.change-password.view :as change-password]
-   [status-im.contexts.profile.settings.screens.password.view :as settings-password]
-   [status-im.contexts.profile.settings.view :as settings]
-   [status-im.contexts.settings.wallet.keypairs-and-accounts.encrypted-qr.view :as
-    encrypted-key-pair-qr]
-   [status-im.contexts.settings.wallet.keypairs-and-accounts.rename.view :as keypair-rename]
-   [status-im.contexts.settings.wallet.keypairs-and-accounts.scan-qr.view :as scan-keypair-qr]
-   [status-im.contexts.settings.wallet.keypairs-and-accounts.view :as keypairs-and-accounts]
-   [status-im.contexts.settings.wallet.network-settings.view :as network-settings]
-   [status-im.contexts.settings.wallet.saved-addresses.add-address-to-save.view :as
-    wallet-add-address-to-save]
-   [status-im.contexts.settings.wallet.saved-addresses.save-address.view :as wallet-save-address]
-   [status-im.contexts.settings.wallet.saved-addresses.view :as saved-addresses-settings]
-   [status-im.contexts.settings.wallet.wallet-options.view :as wallet-options]
-   [status-im.contexts.shell.activity-center.view :as activity-center]
-   [status-im.contexts.shell.jump-to.view :as shell]
-   [status-im.contexts.shell.qr-reader.view :as shell-qr-reader]
-   [status-im.contexts.shell.share.view :as share]
-   [status-im.contexts.syncing.find-sync-code.view :as find-sync-code]
-   [status-im.contexts.syncing.how-to-pair.view :as how-to-pair]
-   [status-im.contexts.syncing.scan-sync-code-page.view :as scan-sync-code-page]
-   [status-im.contexts.syncing.setup-syncing.view :as settings-setup-syncing]
-   [status-im.contexts.syncing.syncing-devices-list.view :as settings-syncing]
-   [status-im.contexts.wallet.account.edit-account.view :as wallet-edit-account]
-   [status-im.contexts.wallet.account.share-address.view :as wallet-share-address]
-   [status-im.contexts.wallet.account.view :as wallet-accounts]
-   [status-im.contexts.wallet.add-account.add-address-to-watch.confirm-address.view :as
-    wallet-confirm-address-to-watch]
-   [status-im.contexts.wallet.add-account.add-address-to-watch.view :as wallet-add-address-to-watch]
-   [status-im.contexts.wallet.add-account.create-account.edit-derivation-path.view :as
-    wallet-edit-derivation-path]
-   [status-im.contexts.wallet.add-account.create-account.import-private-key.view :as
-    wallet-import-private-key]
-   [status-im.contexts.wallet.add-account.create-account.key-pair-name.view :as
-    wallet-key-pair-name]
-   [status-im.contexts.wallet.add-account.create-account.new-keypair.backup-recovery-phrase.view :as
-    wallet-backup-recovery-phrase]
-   [status-im.contexts.wallet.add-account.create-account.new-keypair.confirm-backup.view :as
-    wallet-confirm-backup]
-   [status-im.contexts.wallet.add-account.create-account.select-keypair.view :as wallet-select-keypair]
-   [status-im.contexts.wallet.add-account.create-account.view :as wallet-create-account]
-   [status-im.contexts.wallet.bridge.bridge-to.view :as wallet-bridge-to]
-   [status-im.contexts.wallet.bridge.input-amount.view :as wallet-bridge-input-amount]
-   [status-im.contexts.wallet.bridge.select-asset.view :as wallet-bridge-select-asset]
-   [status-im.contexts.wallet.collectible.view :as wallet-collectible]
-   [status-im.contexts.wallet.common.scan-account.view :as wallet-scan-address]
-   [status-im.contexts.wallet.connected-dapps.view :as wallet-connected-dapps]
-   [status-im.contexts.wallet.send.from.view :as wallet-select-from]
-   [status-im.contexts.wallet.send.select-address.view :as wallet-select-address]
-   [status-im.contexts.wallet.send.select-asset.view :as wallet-select-asset]
-   [status-im.contexts.wallet.send.select-collectible-amount.view :as wallet-select-collectible-amount]
-   [status-im.contexts.wallet.send.send-amount.view :as wallet-send-input-amount]
-   [status-im.contexts.wallet.send.transaction-confirmation.view :as wallet-transaction-confirmation]
-   [status-im.contexts.wallet.send.transaction-progress.view :as wallet-transaction-progress]
-   [status-im.contexts.wallet.swap.select-asset-to-pay.view :as wallet-swap-select-asset-to-pay]
-   [status-im.contexts.wallet.wallet-connect.session-proposal.view :as wallet-connect-session-proposal]
-   [status-im.contexts.wallet.wallet-connect.sign-message.view :as wallet-connect-sign-message]
-   [status-im.navigation.options :as options]
-   [status-im.navigation.transitions :as transitions]))
+    [legacy.status-im.ui.screens.screens :as old-screens]
+    [quo.foundations.colors :as colors]
+    [status-im.common.emoji-picker.view :as emoji-picker]
+    [status-im.common.enter-seed-phrase.view :as enter-seed-phrase]
+    [status-im.common.lightbox.view :as lightbox]
+    [status-im.config :as config]
+    [status-im.contexts.chat.group-create.view :as group-create]
+    [status-im.contexts.chat.group-details.view :as group-details]
+    [status-im.contexts.chat.home.add-new-contact.scan.scan-profile-qr-page :as scan-profile-qr-page]
+    [status-im.contexts.chat.home.add-new-contact.views :as add-new-contact]
+    [status-im.contexts.chat.home.new-chat.view :as new-chat]
+    [status-im.contexts.chat.messenger.camera.view :as camera-screen]
+    [status-im.contexts.chat.messenger.messages.view :as chat]
+    [status-im.contexts.chat.messenger.photo-selector.view :as photo-selector]
+    [status-im.contexts.communities.actions.accounts-selection.view :as communities.accounts-selection]
+    [status-im.contexts.communities.actions.addresses-for-permissions.view :as
+     addresses-for-permissions]
+    [status-im.contexts.communities.actions.airdrop-addresses.view :as airdrop-addresses]
+    [status-im.contexts.communities.actions.channel-view-details.view :as
+     channel-view-channel-members-and-details]
+    [status-im.contexts.communities.actions.invite-contacts.view :as communities.invite]
+    [status-im.contexts.communities.actions.request-to-join.view :as join-menu]
+    [status-im.contexts.communities.actions.share-community-channel.view :as share-community-channel]
+    [status-im.contexts.communities.actions.share-community.view :as share-community]
+    [status-im.contexts.communities.discover.view :as communities.discover]
+    [status-im.contexts.communities.overview.view :as communities.overview]
+    [status-im.contexts.onboarding.create-password.view :as create-password]
+    [status-im.contexts.onboarding.create-profile.view :as create-profile]
+    [status-im.contexts.onboarding.enable-biometrics.view :as enable-biometrics]
+    [status-im.contexts.onboarding.enable-notifications.view :as enable-notifications]
+    [status-im.contexts.onboarding.generating-keys.view :as generating-keys]
+    [status-im.contexts.onboarding.identifiers.view :as identifiers]
+    [status-im.contexts.onboarding.intro.view :as intro]
+    [status-im.contexts.onboarding.new-to-status.view :as new-to-status]
+    [status-im.contexts.onboarding.sign-in.view :as sign-in]
+    [status-im.contexts.onboarding.syncing.progress.view :as syncing-devices]
+    [status-im.contexts.onboarding.syncing.results.view :as syncing-results]
+    [status-im.contexts.onboarding.welcome.view :as welcome]
+    [status-im.contexts.preview.feature-flags.view :as feature-flags]
+    [status-im.contexts.preview.quo.component-preview.view :as component-preview]
+    [status-im.contexts.preview.quo.main :as quo.preview]
+    [status-im.contexts.preview.status-im.main :as status-im-preview]
+    [status-im.contexts.profile.contact.share.view :as share-contact]
+    [status-im.contexts.profile.contact.view :as contact-profile]
+    [status-im.contexts.profile.edit.accent-colour.view :as edit-accent-colour]
+    [status-im.contexts.profile.edit.bio.view :as edit-bio]
+    [status-im.contexts.profile.edit.name.view :as edit-name]
+    [status-im.contexts.profile.edit.view :as edit-profile]
+    [status-im.contexts.profile.profiles.view :as profiles]
+    [status-im.contexts.profile.settings.screens.messages.blocked-users.view :as
+     settings.blocked-users]
+    [status-im.contexts.profile.settings.screens.messages.view :as settings.messages]
+    [status-im.contexts.profile.settings.screens.password.change-password.loading :as
+     change-password-loading]
+    [status-im.contexts.profile.settings.screens.password.change-password.view :as change-password]
+    [status-im.contexts.profile.settings.screens.password.view :as settings-password]
+    [status-im.contexts.profile.settings.view :as settings]
+    [status-im.contexts.settings.wallet.keypairs-and-accounts.encrypted-qr.view :as
+     encrypted-key-pair-qr]
+    [status-im.contexts.settings.wallet.keypairs-and-accounts.rename.view :as keypair-rename]
+    [status-im.contexts.settings.wallet.keypairs-and-accounts.scan-qr.view :as scan-keypair-qr]
+    [status-im.contexts.settings.wallet.keypairs-and-accounts.view :as keypairs-and-accounts]
+    [status-im.contexts.settings.wallet.network-settings.view :as network-settings]
+    [status-im.contexts.settings.wallet.saved-addresses.add-address-to-save.view :as
+     wallet-add-address-to-save]
+    [status-im.contexts.settings.wallet.saved-addresses.save-address.view :as wallet-save-address]
+    [status-im.contexts.settings.wallet.saved-addresses.view :as saved-addresses-settings]
+    [status-im.contexts.settings.wallet.wallet-options.view :as wallet-options]
+    [status-im.contexts.shell.activity-center.view :as activity-center]
+    [status-im.contexts.shell.jump-to.view :as shell]
+    [status-im.contexts.shell.qr-reader.view :as shell-qr-reader]
+    [status-im.contexts.shell.share.view :as share]
+    [status-im.contexts.syncing.find-sync-code.view :as find-sync-code]
+    [status-im.contexts.syncing.how-to-pair.view :as how-to-pair]
+    [status-im.contexts.syncing.scan-sync-code-page.view :as scan-sync-code-page]
+    [status-im.contexts.syncing.setup-syncing.view :as settings-setup-syncing]
+    [status-im.contexts.syncing.syncing-devices-list.view :as settings-syncing]
+    [status-im.contexts.wallet.account.edit-account.view :as wallet-edit-account]
+    [status-im.contexts.wallet.account.share-address.view :as wallet-share-address]
+    [status-im.contexts.wallet.account.view :as wallet-accounts]
+    [status-im.contexts.wallet.add-account.add-address-to-watch.confirm-address.view :as
+     wallet-confirm-address-to-watch]
+    [status-im.contexts.wallet.add-account.add-address-to-watch.view :as wallet-add-address-to-watch]
+    [status-im.contexts.wallet.add-account.create-account.edit-derivation-path.view :as
+     wallet-edit-derivation-path]
+    [status-im.contexts.wallet.add-account.create-account.import-private-key.view :as
+     wallet-import-private-key]
+    [status-im.contexts.wallet.add-account.create-account.key-pair-name.view :as
+     wallet-key-pair-name]
+    [status-im.contexts.wallet.add-account.create-account.new-keypair.backup-recovery-phrase.view :as
+     wallet-backup-recovery-phrase]
+    [status-im.contexts.wallet.add-account.create-account.new-keypair.confirm-backup.view :as
+     wallet-confirm-backup]
+    [status-im.contexts.wallet.add-account.create-account.select-keypair.view :as wallet-select-keypair]
+    [status-im.contexts.wallet.add-account.create-account.view :as wallet-create-account]
+    [status-im.contexts.wallet.bridge.bridge-to.view :as wallet-bridge-to]
+    [status-im.contexts.wallet.bridge.input-amount.view :as wallet-bridge-input-amount]
+    [status-im.contexts.wallet.bridge.select-asset.view :as wallet-bridge-select-asset]
+    [status-im.contexts.wallet.collectible.view :as wallet-collectible]
+    [status-im.contexts.wallet.common.scan-account.view :as wallet-scan-address]
+    [status-im.contexts.wallet.connected-dapps.view :as wallet-connected-dapps]
+    [status-im.contexts.wallet.send.from.view :as wallet-select-from]
+    [status-im.contexts.wallet.send.select-address.view :as wallet-select-address]
+    [status-im.contexts.wallet.send.select-asset.view :as wallet-select-asset]
+    [status-im.contexts.wallet.send.select-collectible-amount.view :as wallet-select-collectible-amount]
+    [status-im.contexts.wallet.send.send-amount.view :as wallet-send-input-amount]
+    [status-im.contexts.wallet.send.transaction-confirmation.view :as wallet-transaction-confirmation]
+    [status-im.contexts.wallet.send.transaction-progress.view :as wallet-transaction-progress]
+    [status-im.contexts.wallet.swap.select-asset-to-pay.view :as wallet-swap-select-asset-to-pay]
+    [status-im.contexts.wallet.wallet-connect.session-proposal.view :as wallet-connect-session-proposal]
+    [status-im.contexts.wallet.wallet-connect.sign-message.view :as wallet-connect-sign-message]
+    [status-im.navigation.options :as options]
+    [status-im.navigation.transitions :as transitions]))
 
 (defn screens
   []