diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs index f9261e9ab1..3a482eccfd 100644 --- a/src/status_im/subs.cljs +++ b/src/status_im/subs.cljs @@ -605,6 +605,7 @@ (fn [multiaccounts] (> (count multiaccounts) 1))) +;; NOTE: this subscription only works on login (re-frame/reg-sub :multiaccounts.login/keycard-account? :<- [:multiaccounts/multiaccounts] @@ -612,6 +613,12 @@ (fn [[multiaccounts {:keys [key-uid]}]] (get-in multiaccounts [key-uid :keycard-pairing]))) +(re-frame/reg-sub + :multiaccounts/keycard-account? + :<- [:multiaccount] + (fn [multiaccount] + (:keycard-pairing multiaccount))) + (re-frame/reg-sub :accounts-without-watch-only :<- [:multiaccount/accounts] diff --git a/src/status_im/ui/screens/wallet/transactions/views.cljs b/src/status_im/ui/screens/wallet/transactions/views.cljs index 05453b5970..f295ae27b4 100644 --- a/src/status_im/ui/screens/wallet/transactions/views.cljs +++ b/src/status_im/ui/screens/wallet/transactions/views.cljs @@ -38,7 +38,8 @@ (defn render-transaction [{:keys [label contact address contact-accessibility-label address-accessibility-label currency-text amount-text - time-formatted on-touch-fn type hash]}] + time-formatted on-touch-fn type hash]} + _ _ {:keys [keycard-account?]}] [react/view [list/touchable-item on-touch-fn [react/view {:accessibility-label :transaction-item} @@ -75,7 +76,8 @@ :style {:margin-top 10} :icon-opts (merge styles/forward {:accessibility-label :show-transaction-button})}]]]] - (when (= type :pending) + (when (and (not keycard-account?) + (= type :pending)) [react/view {:flex-direction :row :padding 16 :justify-content :space-between} [quo/button {:on-press #(re-frame/dispatch [:signing.ui/increase-gas-pressed hash])} @@ -108,6 +110,8 @@ [transactions-history-sections address] (let [fetching-recent-history? @(re-frame/subscribe [:wallet/fetching-recent-tx-history? address]) fetching-more-history? @(re-frame/subscribe [:wallet/fetching-tx-history? address]) + keycard-account? @(re-frame/subscribe [:multiaccounts/keycard-account?]) + all-fetched? @(re-frame/subscribe [:wallet/tx-history-fetched? address])] [react/view components.styles/flex [etherscan-link address] @@ -121,6 +125,7 @@ [list/section-list {:sections transactions-history-sections :key-fn :hash + :render-data {:keycard-account? keycard-account?} :render-fn render-transaction :empty-component [react/i18n-text {:style styles/empty-text