Skip to content

Commit

Permalink
chore(trading): update const and names
Browse files Browse the repository at this point in the history
  • Loading branch information
adderpositive committed Feb 11, 2025
1 parent 0f780bb commit 690b573
Show file tree
Hide file tree
Showing 8 changed files with 89 additions and 96 deletions.
58 changes: 33 additions & 25 deletions suite-common/trading/src/actions/buyActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,54 @@ import { BuyInfo } from '../reducers/buyReducer';

const BUY_COMMON_PREFIX = '@trading-buy';

export const SAVE_BUY_INFO = `${BUY_COMMON_PREFIX}/save_buy_info`;
export const SAVE_QUOTE_REQUEST = `${BUY_COMMON_PREFIX}/save_buy_quote_request`;
export const SAVE_TRANSACTION_DETAIL_ID = `${BUY_COMMON_PREFIX}/save_transaction_detail_id`;
export const SET_IS_FROM_REDIRECT = `${BUY_COMMON_PREFIX}/set_is_from_redirect`;
export const SAVE_QUOTES = `${BUY_COMMON_PREFIX}/save_buy_quotes`;
export const SAVE_QUOTE = `${BUY_COMMON_PREFIX}/save_buy_quote`;
export const CLEAR_QUOTES = `${BUY_COMMON_PREFIX}/clear_buy_quotes`;
export const VERIFY_ADDRESS = `${BUY_COMMON_PREFIX}/verify_address`;
export const SAVE_TRANSACTION_ID = `${BUY_COMMON_PREFIX}/save_transaction_id`;
export const DISPOSE = `${BUY_COMMON_PREFIX}/dispose`;
const saveBuyInfo = createAction(`${BUY_COMMON_PREFIX}/save_buy_info`, (payload: BuyInfo) => ({
payload,
}));

const saveBuyInfo = createAction(SAVE_BUY_INFO, (payload: BuyInfo) => ({ payload }));
const dispose = createAction(`${BUY_COMMON_PREFIX}/dispose`);

const dispose = createAction(DISPOSE);
const setIsFromRedirect = createAction(
`${BUY_COMMON_PREFIX}/set_is_from_redirect`,
(payload: boolean) => ({ payload }),
);

const setIsFromRedirect = createAction(SET_IS_FROM_REDIRECT, (payload: boolean) => ({ payload }));
const saveTransactionId = createAction(
`${BUY_COMMON_PREFIX}/save_transaction_id`,
(payload: string) => ({
payload,
}),
);

const saveTransactionDetailId = createAction(SAVE_TRANSACTION_DETAIL_ID, (payload: string) => ({
payload,
}));
const saveQuoteRequest = createAction(
`${BUY_COMMON_PREFIX}/save_buy_quote_request`,
(payload: BuyTradeQuoteRequest) => ({
payload,
}),
);

const saveQuoteRequest = createAction(SAVE_QUOTE_REQUEST, (payload: BuyTradeQuoteRequest) => ({
const saveQuotes = createAction(`${BUY_COMMON_PREFIX}/save_buy_quotes`, (payload: BuyTrade[]) => ({
payload,
}));

const saveQuotes = createAction(SAVE_QUOTES, (payload: BuyTrade[]) => ({ payload }));

const saveSelectedQuote = createAction(SAVE_QUOTE, (payload: BuyTrade | undefined) => ({
payload,
}));
const saveSelectedQuote = createAction(
`${BUY_COMMON_PREFIX}/save_buy_quote`,
(payload: BuyTrade | undefined) => ({
payload,
}),
);

const clearQuotes = createAction(CLEAR_QUOTES);
const clearQuotes = createAction(`${BUY_COMMON_PREFIX}/clear_buy_quotes`);

const verifyAddress = createAction(VERIFY_ADDRESS, (payload: string | undefined) => ({ payload }));
const verifyAddress = createAction(
`${BUY_COMMON_PREFIX}/verify_address`,
(payload: string | undefined) => ({ payload }),
);

export const tradingBuyActions = {
saveBuyInfo,
dispose,
setIsFromRedirect,
saveTransactionDetailId,
saveTransactionId,
saveQuoteRequest,
saveQuotes,
saveSelectedQuote,
Expand Down
47 changes: 21 additions & 26 deletions suite-common/trading/src/actions/tradingActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,35 @@ import { CryptoId, InfoResponse } from 'invity-api';
import { TradingComposedTransactionInfo } from '../reducers/tradingReducer';
import { TradingPaymentMethodListProps, TradingTransaction, TradingType } from '../types';

// TODO: maybe move to constants
const TRADING_COMMON_PREFIX = '@trading-common';
const INFO_COMMON_PREFIX = '@trading-info'; // TODO: unify with TRADING_COMMON_PREFIX

export const SAVE_COMPOSED_TRANSACTION_INFO = `${TRADING_COMMON_PREFIX}/save_composed_transaction_info`;
export const SAVE_TRADE = `${TRADING_COMMON_PREFIX}/save_trade`;
export const LOAD_DATA = `${TRADING_COMMON_PREFIX}/load_data`;
export const SET_LOADING = `${TRADING_COMMON_PREFIX}/set_loading`; // TODO: DEPRECATED?
export const SET_MODAL_CRYPTO_CURRENCY = `${TRADING_COMMON_PREFIX}/set_modal_crypto_currency`;
export const SET_MODAL_ACCOUNT_KEY = `${TRADING_COMMON_PREFIX}/set_modal_account_key`;
export const SET_TRADING_ACTIVE_SECTION = `${TRADING_COMMON_PREFIX}/set_trading_active_section`;
export const SET_TRADING_FROM_PREFILLED_CRYPTO_ID = `${TRADING_COMMON_PREFIX}/set_trading_from_prefilled_crypto_id`;

export const SAVE_SYMBOLS_INFO = `${INFO_COMMON_PREFIX}/save-info`;
export const SAVE_PAYMENT_METHODS = `${INFO_COMMON_PREFIX}/payment-methods`;

const saveInfo = createAction(SAVE_SYMBOLS_INFO, (payload: InfoResponse) => ({
const saveInfo = createAction(`${TRADING_COMMON_PREFIX}/save-info`, (payload: InfoResponse) => ({
payload,
}));

const savePaymentMethods = createAction(
SAVE_PAYMENT_METHODS,
`${TRADING_COMMON_PREFIX}/payment-methods`,
(payload: TradingPaymentMethodListProps[]) => ({
payload,
}),
);

const saveComposedTransactionInfo = createAction(
SAVE_COMPOSED_TRANSACTION_INFO,
`${TRADING_COMMON_PREFIX}/save_composed_transaction_info`,
(payload: TradingComposedTransactionInfo) => ({
payload,
}),
);

const saveTrade = createAction(SAVE_TRADE, (payload: TradingTransaction) => ({ payload }));
const saveTrade = createAction(
`${TRADING_COMMON_PREFIX}/save_trade`,
(payload: TradingTransaction) => ({ payload }),
);

const loadInvityData = createAction(LOAD_DATA);
const loadInvityData = createAction(`${TRADING_COMMON_PREFIX}/load_data`);

const setLoading = createAction(
SET_LOADING,
`${TRADING_COMMON_PREFIX}/set_loading`,
(isLoading: boolean, lastLoadedTimestamp?: number) => ({
payload: {
isLoading,
Expand All @@ -52,19 +41,25 @@ const setLoading = createAction(
}),
);

const setModalCryptoCurrency = createAction(SET_MODAL_CRYPTO_CURRENCY, (payload: CryptoId) => ({
payload,
}));
const setModalCryptoCurrency = createAction(
`${TRADING_COMMON_PREFIX}/set_modal_crypto_currency`,
(payload: CryptoId) => ({
payload,
}),
);

const setModalAccountKey = createAction(SET_MODAL_ACCOUNT_KEY, (payload: string) => ({ payload }));
const setModalAccountKey = createAction(
`${TRADING_COMMON_PREFIX}/set_modal_account_key`,
(payload: string) => ({ payload }),
);

const setTradingActiveSection = createAction(
SET_TRADING_ACTIVE_SECTION,
`${TRADING_COMMON_PREFIX}/set_trading_active_section`,
(payload: TradingType) => ({ payload }),
);

const setTradingFromPrefilledCryptoId = createAction(
SET_TRADING_FROM_PREFILLED_CRYPTO_ID,
`${TRADING_COMMON_PREFIX}/set_trading_from_prefilled_crypto_id`,
(payload: CryptoId | undefined) => ({ payload }),
);

Expand Down
10 changes: 5 additions & 5 deletions suite-common/trading/src/middlewares/tradingMiddleware.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createMiddleware } from '@suite-common/redux-utils';

import { tradingBuyActions } from '../actions/buyActions';
import * as tradingActions from '../actions/tradingActions';
import { tradingActions } from '../actions/tradingActions';
import { INVITY_API_RELOAD_DATA_AFTER_MS } from '../constants';
import { invityAPI } from '../invityAPI';
import { TradingRootState, selectState } from '../selectors/tradingSelectors';
Expand All @@ -23,7 +23,7 @@ export const tradingMiddleware = createMiddleware(async (action, { dispatch, nex
const state = selectState(getState());
const { isLoading, lastLoadedTimestamp } = state.wallet.trading;

if (action.type === tradingActions.LOAD_DATA) {
if (action.type === tradingActions.loadInvityData.type) {
const account = getAccountAccordingToRoute(state);
const { platforms, coins } = state.wallet.trading.info;
const { buyInfo } = state.wallet.trading.buy;
Expand All @@ -37,7 +37,7 @@ export const tradingMiddleware = createMiddleware(async (action, { dispatch, nex
(isDifferentAccount ||
lastLoadedTimestamp + INVITY_API_RELOAD_DATA_AFTER_MS < Date.now())
) {
dispatch(tradingActions.tradingActions.setLoading(true));
dispatch(tradingActions.setLoading(true));

const { invityServerEnvironment } = state.suite.settings.debug;
if (invityServerEnvironment) {
Expand All @@ -49,7 +49,7 @@ export const tradingMiddleware = createMiddleware(async (action, { dispatch, nex
if (isDifferentAccount || !platforms || !coins) {
const info = await invityAPI.getInfo();

dispatch(tradingActions.tradingActions.saveInfo(info));
dispatch(tradingActions.saveInfo(info));
}

if (isDifferentAccount || !buyInfo) {
Expand All @@ -58,7 +58,7 @@ export const tradingMiddleware = createMiddleware(async (action, { dispatch, nex
dispatch(tradingBuyActions.saveBuyInfo(buyInfoData));
}

dispatch(tradingActions.tradingActions.setLoading(false, Date.now()));
dispatch(tradingActions.setLoading(false, Date.now()));
}
}

Expand Down
20 changes: 10 additions & 10 deletions suite-common/trading/src/reducers/__fixtures__/buyTradingReducer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { BuyTrade, BuyTradeQuoteRequest, CryptoId } from 'invity-api';

import * as BUY_TRADING_ACTIONS from '../../actions/buyActions';
import { tradingBuyActions } from '../../actions/buyActions';
import { BuyInfo, TradingBuyState } from '../buyReducer';

export const buyInitialState: TradingBuyState = {
Expand Down Expand Up @@ -69,7 +69,7 @@ export const buyTradingFixtures = [
initialState: buyInitialState,
actions: [
{
type: BUY_TRADING_ACTIONS.SAVE_BUY_INFO,
type: tradingBuyActions.saveBuyInfo.type,
payload: buyInfo,
},
],
Expand All @@ -83,7 +83,7 @@ export const buyTradingFixtures = [
initialState: buyInitialState,
actions: [
{
type: BUY_TRADING_ACTIONS.SAVE_QUOTE_REQUEST,
type: tradingBuyActions.saveQuoteRequest.type,
payload: quotesRequest,
},
],
Expand All @@ -97,7 +97,7 @@ export const buyTradingFixtures = [
initialState: buyInitialState,
actions: [
{
type: BUY_TRADING_ACTIONS.SAVE_TRANSACTION_DETAIL_ID,
type: tradingBuyActions.saveTransactionId.type,
payload: '1234-1234-1234',
},
],
Expand All @@ -111,7 +111,7 @@ export const buyTradingFixtures = [
initialState: buyInitialState,
actions: [
{
type: BUY_TRADING_ACTIONS.SAVE_QUOTES,
type: tradingBuyActions.saveQuotes.type,
payload: buyQuotes,
},
],
Expand All @@ -128,7 +128,7 @@ export const buyTradingFixtures = [
},
actions: [
{
type: BUY_TRADING_ACTIONS.CLEAR_QUOTES,
type: tradingBuyActions.clearQuotes.type,
},
],
result: {
Expand All @@ -140,7 +140,7 @@ export const buyTradingFixtures = [
initialState: buyInitialState,
actions: [
{
type: BUY_TRADING_ACTIONS.VERIFY_ADDRESS,
type: tradingBuyActions.verifyAddress.type,
payload: '1abcdef',
},
],
Expand All @@ -157,7 +157,7 @@ export const buyTradingFixtures = [
},
actions: [
{
type: BUY_TRADING_ACTIONS.DISPOSE,
type: tradingBuyActions.dispose.type,
},
],
result: {
Expand All @@ -169,7 +169,7 @@ export const buyTradingFixtures = [
initialState: buyInitialState,
actions: [
{
type: BUY_TRADING_ACTIONS.SAVE_QUOTE,
type: tradingBuyActions.saveSelectedQuote.type,
payload: buyQuotes[0],
},
],
Expand All @@ -183,7 +183,7 @@ export const buyTradingFixtures = [
initialState: buyInitialState,
actions: [
{
type: BUY_TRADING_ACTIONS.SET_IS_FROM_REDIRECT,
type: tradingBuyActions.setIsFromRedirect.type,
payload: true,
},
],
Expand Down
Loading

0 comments on commit 690b573

Please sign in to comment.