refactor: tidy up transferMeow

zer0-os · Sep 26, 2024 · a7ad5e4 · a7ad5e4
1 parent 31e0db7
commit a7ad5e4
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 30 deletions.
diff --git a/src/store/rewards/index.ts b/src/store/rewards/index.ts
@@ -32,9 +32,13 @@ export const initialState: RewardsState = {
 
 export const totalRewardsViewed = createAction(SagaActionTypes.TotalRewardsViewed);
 export const closeRewardsTooltip = createAction(SagaActionTypes.CloseRewardsTooltip);
-export const transferMeow = createAction<{ meowSenderUserId: string; meowRecipientUserId: string; amount: string }>(
- SagaActionTypes.TransferMeow
-);
+export const transferMeow = createAction<{
+ meowSenderId: string;
+ postOwnerId: string;
+ postMessageId: string;
+ meowAmount: string;
+ roomId: string;
+}>(SagaActionTypes.TransferMeow);
 
 const slice = createSlice({
  name: 'rewards',

diff --git a/src/store/rewards/saga.test.ts b/src/store/rewards/saga.test.ts
@@ -113,9 +113,9 @@ describe(checkNewRewardsLoaded, () => {
 
 describe(transferMeow, () => {
  it('handles successful MEOW transfer', async () => {
- const meowSenderUserId = 'sender-id';
- const meowRecipientUserId = 'recipient-id';
- const amount = '500000000000000000';
+ const meowSenderId = 'sender-id';
+ const postOwnerId = 'post-owner-id';
+ const meowAmount = '500000000000000000';
 
  const apiResponse = {
  success: true,
@@ -126,22 +126,22 @@ describe(transferMeow, () => {
  };
 
  const { storeState } = await expectSaga(transferMeow, {
- payload: { meowSenderUserId, meowRecipientUserId, amount },
+ payload: { meowSenderId, postOwnerId, meowAmount },
  })
  .withReducer(rootReducer, initialState())
- .provide([[call(transferMeowAPI, meowSenderUserId, meowRecipientUserId, amount), apiResponse]])
+ .provide([[call(transferMeowAPI, meowSenderId, postOwnerId, meowAmount), apiResponse]])
  .run();
 
  expect(storeState.rewards.meow).toEqual('500000000000000000');
  });
 
- it('handles meowSenderUserId is equal to meowRecipientUserId failure', async () => {
- const meowSenderUserId = 'sender-id';
- const meowRecipientUserId = 'sender-id';
- const amount = '500000000000000000';
+ it('handles meowSenderId is equal to postOwnerId failure', async () => {
+ const meowSenderId = 'sender-id';
+ const postOwnerId = 'sender-id';
+ const meowAmount = '500000000000000000';
 
  const { storeState } = await expectSaga(transferMeow, {
- payload: { meowSenderUserId, meowRecipientUserId, amount },
+ payload: { meowSenderId, postOwnerId, meowAmount },
  })
  .withReducer(rootReducer, initialState())
  .run();
@@ -150,46 +150,46 @@ describe(transferMeow, () => {
  });
 
  it('handles API MEOW transfer failure', async () => {
- const meowSenderUserId = 'sender-id';
- const meowRecipientUserId = 'recipient-id';
- const amount = '500000000000000000';
+ const meowSenderId = 'sender-id';
+ const postOwnerId = 'post-owner-id';
+ const meowAmount = '500000000000000000';
 
  const apiResponse = {
  success: false,
  error: 'Transfer failed.',
  };
 
  const { storeState } = await expectSaga(transferMeow, {
- payload: { meowSenderUserId, meowRecipientUserId, amount },
+ payload: { meowSenderId, postOwnerId, meowAmount },
  })
  .withReducer(rootReducer, initialState())
- .provide([[call(transferMeowAPI, meowSenderUserId, meowRecipientUserId, amount), apiResponse]])
+ .provide([[call(transferMeowAPI, meowSenderId, postOwnerId, meowAmount), apiResponse]])
  .run();
 
  expect(storeState.rewards.transferError).toEqual('Transfer failed.');
  });
 
  it('handles unexpected error during MEOW transfer', async () => {
- const meowSenderUserId = 'sender-id';
- const meowRecipientUserId = 'recipient-id';
- const amount = '500000000000000000';
+ const meowSenderId = 'sender-id';
+ const postOwnerId = 'post-owner-id';
+ const meowAmount = '500000000000000000';
 
  const error = new Error('Network error');
 
  const { storeState } = await expectSaga(transferMeow, {
- payload: { meowSenderUserId, meowRecipientUserId, amount },
+ payload: { meowSenderId, postOwnerId, meowAmount },
  })
  .withReducer(rootReducer, initialState())
- .provide([[call(transferMeowAPI, meowSenderUserId, meowRecipientUserId, amount), Promise.reject(error)]])
+ .provide([[call(transferMeowAPI, meowSenderId, postOwnerId, meowAmount), Promise.reject(error)]])
  .run();
 
  expect(storeState.rewards.transferError).toEqual('Network error');
  });
 
  it('handles transfer loading', async () => {
  const meowSenderUserId = 'sender-id';
- const meowRecipientUserId = 'recipient-id';
- const amount = '500000000000000000';
+ const postOwnerId = 'post-owner-id';
+ const meowAmount = '500000000000000000';
 
  const apiResponse = {
  success: true,
@@ -200,10 +200,10 @@ describe(transferMeow, () => {
  };
 
  const { storeState } = await expectSaga(transferMeow, {
- payload: { meowSenderUserId, meowRecipientUserId, amount },
+ payload: { meowSenderUserId, postOwnerId, meowAmount },
  })
  .withReducer(rootReducer, initialState())
- .provide([[call(transferMeowAPI, meowSenderUserId, meowRecipientUserId, amount), apiResponse]])
+ .provide([[call(transferMeowAPI, meowSenderUserId, postOwnerId, meowAmount), apiResponse]])
  .run();
 
  expect(storeState.rewards.transferLoading).toEqual(false);

diff --git a/src/store/rewards/saga.ts b/src/store/rewards/saga.ts
@@ -126,17 +126,17 @@ export function* closeRewardsTooltip() {
 export function* transferMeow(action) {
  yield put(setTransferError({ error: null }));
 
- const { meowSenderUserId, meowRecipientUserId, amount } = action.payload;
+ const { meowSenderId, postOwnerId, postMessageId, meowAmount, roomId } = action.payload;
 
- if (meowSenderUserId === meowRecipientUserId) {
+ if (meowSenderId === postOwnerId) {
  yield put(setTransferError({ error: 'Cannot transfer MEOW to yourself.' }));
  return;
  }
 
  yield put(setTransferLoading(true));
 
  try {
- const result = yield call(transferMeowAPI, meowSenderUserId, meowRecipientUserId, amount);
+ const result = yield call(transferMeowAPI, meowSenderId, postOwnerId, meowAmount);
 
  if (result.success) {
  yield put(setMeow(result.response.senderBalance));