Wallet - refresh activity after sending a transaction #19984

J-Son89 · 2024-05-10T17:37:01Z

fixes: #19981, #19519

This pr does a few things

corrects the navigation for MVP, i.e after confirming a transaction it goes directly to account view and shows the activity tab
refreshes activity after sending a transaction
this in turn refreshes the recent transactions tab in the select address page of sending flows.
to make this work I had to update the tabs component to be controllable, as such we should check other pages with tabs are working alright.

Screen.Recording.2024-05-10.at.18.28.24.mov

status-im-auto · 2024-05-10T17:42:11Z

Jenkins Builds

Click to see older builds (20)

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
✔️	`7904672`	#1	2024-05-10 17:42:11	~4 min	`tests`	📄`log`
✔️	`7904672`	#1	2024-05-10 17:47:04	~9 min	`ios`	📱`ipa` 📲
✔️	`7904672`	#1	2024-05-10 17:47:54	~10 min	`android-e2e`	🤖`apk` 📲
✔️	`7904672`	#1	2024-05-10 17:48:03	~10 min	`android`	🤖`apk` 📲

❌	`4ba54ed`	#2	2024-05-15 07:46:50	~2 min	`tests`	📄`log`
✔️	`4ba54ed`	#2	2024-05-15 07:52:17	~8 min	`android-e2e`	🤖`apk` 📲
✔️	`4ba54ed`	#2	2024-05-15 07:52:20	~8 min	`android`	🤖`apk` 📲
✔️	`4ba54ed`	#2	2024-05-15 07:53:40	~9 min	`ios`	📱`ipa` 📲

❌	`82bc6d5`	#4	2024-05-21 00:14:23	~2 min	`tests`	📄`log`
✔️	`82bc6d5`	#4	2024-05-21 00:18:31	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`82bc6d5`	#4	2024-05-21 00:21:25	~9 min	`ios`	📱`ipa` 📲
✔️	`82bc6d5`	#4	2024-05-21 00:21:50	~10 min	`android`	🤖`apk` 📲

❌	`c98c966`	#5	2024-05-21 13:03:00	~4 min	`tests`	📄`log`
✔️	`c98c966`	#5	2024-05-21 13:08:23	~9 min	`android`	🤖`apk` 📲
✔️	`c98c966`	#5	2024-05-21 13:08:28	~9 min	`android-e2e`	🤖`apk` 📲
✔️	`c98c966`	#5	2024-05-21 13:09:11	~10 min	`ios`	📱`ipa` 📲

✔️	`8d1934c`	#6	2024-05-21 17:32:24	~9 min	`ios`	📱`ipa` 📲
✔️	`8d1934c`	#6	2024-05-21 17:33:35	~10 min	`android`	🤖`apk` 📲
✔️	`8d1934c`	#6	2024-05-21 17:33:35	~10 min	`android-e2e`	🤖`apk` 📲
✔️	`8d1934c`	#7	2024-05-21 18:13:01	~3 min	`tests`	📄`log`

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
✔️	`21e527a`	#8	2024-05-23 21:00:00	~3 min	`tests`	📄`log`
✔️	`21e527a`	#7	2024-05-23 21:05:48	~9 min	`ios`	📱`ipa` 📲
✔️	`21e527a`	#7	2024-05-23 21:06:52	~10 min	`android-e2e`	🤖`apk` 📲
✔️	`21e527a`	#7	2024-05-23 21:07:00	~10 min	`android`	🤖`apk` 📲

✔️	`d503f86`	#9	2024-05-23 22:37:37	~3 min	`tests`	📄`log`
✔️	`d503f86`	#8	2024-05-23 22:43:13	~9 min	`ios`	📱`ipa` 📲
✔️	`d503f86`	#8	2024-05-23 22:44:31	~10 min	`android-e2e`	🤖`apk` 📲
✔️	`d503f86`	#8	2024-05-23 22:44:33	~10 min	`android`	🤖`apk` 📲

J-Son89 · 2024-05-21T17:23:52Z

src/quo/components/tabs/tabs/view.cljs

-  - `scroll-on-press?` When non-nil, clicking on a tag centers it the middle
-    (with animation enabled).
-  "
+(defn view-internal


added a malli schema and removed doc string

defn- view-internal

J-Son89 · 2024-05-21T17:24:07Z

src/quo/components/tabs/tabs/view.cljs

  [{:keys [default-active data fade-end-percentage fade-end? on-change on-scroll scroll-on-press?
-           scrollable? style container-style size blur? in-scroll-view? customization-color]
+           scrollable? style container-style size blur? in-scroll-view? customization-color
+           active-tab-id]


tabs component now is controllable from outside with a prop for value.

J-Son89 · 2024-05-21T17:24:52Z

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

-            :customization-color customization-color
-            :label               (i18n/label :t/jump-to)}}
-          style/shell-button]]))))
+  (let [selected-tab          (or (rf/sub [:wallet/account-tab]) first-tab-id)


selected tab is stored in the reframe db so we can go to the right tab after certain actions (e.g complete transaction)

OmarBasem · 2024-05-22T05:18:02Z

src/quo/components/tabs/tabs/view.cljs

-  - `scroll-on-press?` When non-nil, clicking on a tag centers it the middle
-    (with animation enabled).
-  "
+(defn view-internal


defn- view-internal

OmarBasem · 2024-05-22T05:23:11Z

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

-            [:wallet/wizard-navigate-forward
-             {:current-screen :screen/wallet.transaction-confirmation
-              :flow-id        :wallet-send-flow}]]]})))
+            [:wallet/end-transaction-flow]]]})))


Shouldn't we update the flow_config of bridge and send?

yes good point, I'll double check that. I see you had it in the similar pr so will check with that too 🙏

smohamedjavid

LGTM 🚀

ilmotta · 2024-05-22T11:34:18Z

src/quo/components/tabs/tabs/schema.cljs

@@ -0,0 +1,32 @@
+(ns quo.components.tabs.tabs.schema)
+
+(def ^:private ?data-schema


The question mark prefix should be enough to tell ?data is a schema.

ilmotta · 2024-05-22T11:46:03Z

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

+       :default-active   first-tab-id
+       :active-tab-id    selected-tab
+       :data             (tabs-data watch-only?)
+       :on-change        #(rf/dispatch [:wallet/select-account-tab %])


The handler can be extracted to a var because it doesn't close over values.

ilmotta · 2024-05-22T11:49:17Z

src/status_im/contexts/wallet/events.cljs

@@ -52,6 +56,7 @@
 (rf/reg-event-fx :wallet/close-account-page
 (fn [_]
   {:fx [[:dispatch [:wallet/clean-current-viewing-account]]
+         [:dispatch [:wallet/select-account-tab nil]]


A minor suggestion, but I'd have a separate event to deselect the account tab instead of relying on nil.

(rf/reg-event-fx :wallet/deselect-account-tab (fn [{:keys [db]} _] {:db (update-in db [:wallet :ui :account-page] dissoc :active-tab)}))

ilmotta · 2024-05-22T12:00:44Z

src/quo/components/tabs/tabs/schema.cljs

+  [:sequential
+   [:maybe
+    [:map
+     [:id [:maybe :keyword]]


About the :maybe here, wouldn't it be a bug to have a tab item without an ID? Seems really odd to rely on a nil ID, but maybe that's how it already is and the schema is just explicitly telling us now this oddity?

ilmotta · 2024-05-22T12:01:44Z

src/quo/components/tabs/tabs/schema.cljs

+   [:catn
+    [:props
+     [:map
+      [:default-active {:optional true} [:maybe :keyword]]


When opening the AC, the schema fails because we pass :default-active as a number, not as a keyword.

I forgot about AC, will update

ilmotta

PR LGTM! And thanks for adding schemas to the complex tabs component 👏🏼

status-github-bot bot added this to REVIEW in Pipeline for QA May 10, 2024

J-Son89 mentioned this pull request May 10, 2024

feat(wallet): add recent recipients tab #19942

Merged

J-Son89 self-assigned this May 10, 2024

J-Son89 force-pushed the jc/refresh-activity-after-send branch from 7904672 to 4ba54ed Compare May 15, 2024 07:43

J-Son89 mentioned this pull request May 17, 2024

fix: remove transaction progress from send flow #20079

Closed

J-Son89 force-pushed the jc/refresh-activity-after-send branch from 4ba54ed to e7c911f Compare May 21, 2024 00:10

J-Son89 marked this pull request as ready for review May 21, 2024 12:58

J-Son89 force-pushed the jc/refresh-activity-after-send branch from c98c966 to 8d1934c Compare May 21, 2024 17:22

J-Son89 commented May 21, 2024

View reviewed changes

J-Son89 requested review from OmarBasem, ulisesmac, ilmotta, vkjr, smohamedjavid and BalogunofAfrica May 21, 2024 17:25

OmarBasem reviewed May 22, 2024

View reviewed changes

smohamedjavid approved these changes May 22, 2024

View reviewed changes

ilmotta reviewed May 22, 2024

View reviewed changes

BalogunofAfrica approved these changes May 22, 2024

View reviewed changes

J-Son89 added 3 commits May 23, 2024 19:59

chore(wallet): show activity tab after sending a transaction

ffb6843

follow up

2b8ee35

chore(quo): fix tabs component to be controllable

9ae5839

J-Son89 force-pushed the jc/refresh-activity-after-send branch from 8d1934c to 21e527a Compare May 23, 2024 20:55

chore: schema

d503f86

J-Son89 force-pushed the jc/refresh-activity-after-send branch from 21e527a to d503f86 Compare May 23, 2024 22:33

ilmotta approved these changes May 24, 2024

View reviewed changes

OmarBasem approved these changes May 24, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Wallet - refresh activity after sending a transaction #19984

Wallet - refresh activity after sending a transaction #19984

J-Son89 commented May 10, 2024 •

edited

status-im-auto commented May 10, 2024 •

edited

J-Son89 May 21, 2024

OmarBasem May 22, 2024

J-Son89 May 21, 2024

J-Son89 May 21, 2024

OmarBasem May 22, 2024

OmarBasem May 22, 2024

J-Son89 May 22, 2024

smohamedjavid left a comment

ilmotta May 22, 2024

ilmotta May 22, 2024

ilmotta May 22, 2024

J-Son89 May 23, 2024

ilmotta May 22, 2024

ilmotta May 22, 2024

J-Son89 May 22, 2024

ilmotta left a comment

		@@ -0,0 +1,32 @@
		(ns quo.components.tabs.tabs.schema)

		(def ^:private ?data-schema

Wallet - refresh activity after sending a transaction #19984

Are you sure you want to change the base?

Wallet - refresh activity after sending a transaction #19984

Conversation

J-Son89 commented May 10, 2024 • edited

status-im-auto commented May 10, 2024 • edited

Jenkins Builds

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smohamedjavid left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ilmotta left a comment

Choose a reason for hiding this comment

J-Son89 commented May 10, 2024 •

edited

status-im-auto commented May 10, 2024 •

edited