From a0e7dc65c45e829c4e08cbf5141249e334231336 Mon Sep 17 00:00:00 2001 From: Andrey Shovkoplyas Date: Mon, 20 Aug 2018 20:00:46 +0300 Subject: [PATCH] moved wallet transactions ns Signed-off-by: Andrey Shovkoplyas --- src/status_im/chat/commands/impl/transactions.cljs | 2 +- src/status_im/chat/events/receive_message.cljs | 2 +- src/status_im/chat/subs.cljs | 2 +- src/status_im/{wallet => models}/transactions.cljs | 2 +- src/status_im/ui/screens/wallet/events.cljs | 2 +- src/status_im/ui/screens/wallet/send/events.cljs | 2 +- test/cljs/status_im/test/wallet/transactions.cljs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename src/status_im/{wallet => models}/transactions.cljs (99%) diff --git a/src/status_im/chat/commands/impl/transactions.cljs b/src/status_im/chat/commands/impl/transactions.cljs index 06bbc6a435..09d8f0a266 100644 --- a/src/status_im/chat/commands/impl/transactions.cljs +++ b/src/status_im/chat/commands/impl/transactions.cljs @@ -20,7 +20,7 @@ [status-im.utils.money :as money] [status-im.ui.screens.wallet.db :as wallet.db] [status-im.ui.screens.wallet.choose-recipient.events :as choose-recipient.events] - [status-im.wallet.transactions :as wallet.transactions] + [status-im.models.transactions :as wallet.transactions] [status-im.ui.screens.navigation :as navigation])) ;; common `send/request` functionality diff --git a/src/status_im/chat/events/receive_message.cljs b/src/status_im/chat/events/receive_message.cljs index 9e0efc3b89..dce78067bb 100644 --- a/src/status_im/chat/events/receive_message.cljs +++ b/src/status_im/chat/events/receive_message.cljs @@ -4,7 +4,7 @@ [status-im.chat.models.message :as message-model] [status-im.utils.handlers :as handlers] [status-im.utils.handlers-macro :as handlers-macro] - [status-im.wallet.transactions :as wallet.transactions])) + [status-im.models.transactions :as wallet.transactions])) ;;;; Handlers diff --git a/src/status_im/chat/subs.cljs b/src/status_im/chat/subs.cljs index 7f9a49dfc7..cf9b082c8c 100644 --- a/src/status_im/chat/subs.cljs +++ b/src/status_im/chat/subs.cljs @@ -9,7 +9,7 @@ [status-im.utils.gfycat.core :as gfycat] [status-im.i18n :as i18n] [status-im.constants :as const] - [status-im.wallet.transactions :as transactions])) + [status-im.models.transactions :as transactions])) (reg-sub :get-chats :chats) diff --git a/src/status_im/wallet/transactions.cljs b/src/status_im/models/transactions.cljs similarity index 99% rename from src/status_im/wallet/transactions.cljs rename to src/status_im/models/transactions.cljs index 0ba7a12c97..5f50ce58df 100644 --- a/src/status_im/wallet/transactions.cljs +++ b/src/status_im/models/transactions.cljs @@ -1,4 +1,4 @@ -(ns status-im.wallet.transactions +(ns status-im.models.transactions (:require [clojure.set :as set] [status-im.utils.datetime :as time] [status-im.utils.ethereum.tokens :as tokens] diff --git a/src/status_im/ui/screens/wallet/events.cljs b/src/status_im/ui/screens/wallet/events.cljs index ebe4cd805a..04bb7719bf 100644 --- a/src/status_im/ui/screens/wallet/events.cljs +++ b/src/status_im/ui/screens/wallet/events.cljs @@ -15,7 +15,7 @@ [status-im.constants :as constants] [status-im.ui.screens.navigation :as navigation] [status-im.utils.money :as money] - [status-im.wallet.transactions :as wallet.transactions])) + [status-im.models.transactions :as wallet.transactions])) (defn get-balance [{:keys [web3 account-id on-success on-error]}] (if (and web3 account-id) diff --git a/src/status_im/ui/screens/wallet/send/events.cljs b/src/status_im/ui/screens/wallet/send/events.cljs index 5c48bff61f..22c192f732 100644 --- a/src/status_im/ui/screens/wallet/send/events.cljs +++ b/src/status_im/ui/screens/wallet/send/events.cljs @@ -17,7 +17,7 @@ [status-im.chat.commands.sending :as commands-sending] [status-im.constants :as constants] [status-im.ui.screens.navigation :as navigation] - [status-im.wallet.transactions :as wallet.transactions])) + [status-im.models.transactions :as wallet.transactions])) ;;;; FX diff --git a/test/cljs/status_im/test/wallet/transactions.cljs b/test/cljs/status_im/test/wallet/transactions.cljs index c27dd64c28..cda8f34941 100644 --- a/test/cljs/status_im/test/wallet/transactions.cljs +++ b/test/cljs/status_im/test/wallet/transactions.cljs @@ -1,7 +1,7 @@ (ns status-im.test.wallet.transactions (:require [cljs.test :refer-macros [deftest is testing]] [status-im.utils.datetime :as time] - [status-im.wallet.transactions :as wallet.transactions])) + [status-im.models.transactions :as wallet.transactions])) (deftest test-store-chat-transaction-hash (is (= (wallet.transactions/store-chat-transaction-hash "0x318f566edd98eb29965067d3394c555050bf9f8e20183792c7f1a6bbc1bb34db"