Skip to content

Commit da34dba

Browse files
Jeff Yantajeffyanta
Jeff Yanta
authored and
jeffyanta
committed
Change all merchant receive-like verbs to receive
1 parent 7b44b7c commit da34dba

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

‎pkg/code/chat/message_merchant.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func SendMerchantExchangeMessage(ctx context.Context, data code_data.Provider, i
6565

6666
verbByMessageReceiver[intentRecord.InitiatorOwnerAccount] = chatpb.ExchangeDataContent_SPENT
6767
if len(intentRecord.SendPrivatePaymentMetadata.DestinationOwnerAccount) > 0 {
68-
verbByMessageReceiver[intentRecord.SendPrivatePaymentMetadata.DestinationOwnerAccount] = chatpb.ExchangeDataContent_PAID
68+
verbByMessageReceiver[intentRecord.SendPrivatePaymentMetadata.DestinationOwnerAccount] = chatpb.ExchangeDataContent_RECEIVED
6969
}
7070
} else if intentRecord.SendPrivatePaymentMetadata.IsWithdrawal {
7171
if len(intentRecord.SendPrivatePaymentMetadata.DestinationOwnerAccount) > 0 {
@@ -79,7 +79,7 @@ func SendMerchantExchangeMessage(ctx context.Context, data code_data.Provider, i
7979
chatTitle = *destinationAccountInfoRecord.RelationshipTo
8080
chatType = chat.ChatTypeExternalApp
8181
isVerifiedChat = true
82-
verbByMessageReceiver[intentRecord.SendPrivatePaymentMetadata.DestinationOwnerAccount] = chatpb.ExchangeDataContent_DEPOSITED
82+
verbByMessageReceiver[intentRecord.SendPrivatePaymentMetadata.DestinationOwnerAccount] = chatpb.ExchangeDataContent_RECEIVED
8383
}
8484
}
8585
}
@@ -96,7 +96,7 @@ func SendMerchantExchangeMessage(ctx context.Context, data code_data.Provider, i
9696
chatTitle = *destinationAccountInfoRecord.RelationshipTo
9797
chatType = chat.ChatTypeExternalApp
9898
isVerifiedChat = true
99-
verbByMessageReceiver[intentRecord.SendPublicPaymentMetadata.DestinationOwnerAccount] = chatpb.ExchangeDataContent_DEPOSITED
99+
verbByMessageReceiver[intentRecord.SendPublicPaymentMetadata.DestinationOwnerAccount] = chatpb.ExchangeDataContent_RECEIVED
100100
}
101101
}
102102
}
@@ -112,7 +112,7 @@ func SendMerchantExchangeMessage(ctx context.Context, data code_data.Provider, i
112112
chatTitle = *destinationAccountInfoRecord.RelationshipTo
113113
chatType = chat.ChatTypeExternalApp
114114
isVerifiedChat = true
115-
verbByMessageReceiver[intentRecord.ExternalDepositMetadata.DestinationOwnerAccount] = chatpb.ExchangeDataContent_DEPOSITED
115+
verbByMessageReceiver[intentRecord.ExternalDepositMetadata.DestinationOwnerAccount] = chatpb.ExchangeDataContent_RECEIVED
116116
}
117117
default:
118118
return nil, nil
@@ -150,7 +150,7 @@ func SendMerchantExchangeMessage(ctx context.Context, data code_data.Provider, i
150150
isVerifiedChat,
151151
receiver,
152152
protoMessage,
153-
verb != chatpb.ExchangeDataContent_PAID || !isVerifiedChat,
153+
verb != chatpb.ExchangeDataContent_RECEIVED || !isVerifiedChat,
154154
)
155155
if err != nil && err != chat.ErrMessageAlreadyExists {
156156
return nil, errors.Wrap(err, "error persisting chat message")

‎pkg/code/server/grpc/transaction/v2/history_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ func TestPaymentHistory_HappyPath(t *testing.T) {
104104
sendingPhone.conf.simulatePaymentRequest = true
105105

106106
// [Verified Merchant] sendingPhone SPENT $77.7 USD of Kin
107-
// [Verified Merchant] receivingPhone PAID $77.7 USD of Kin
107+
// [Verified Merchant] receivingPhone RECEIVED $77.7 USD of Kin
108108
sendingPhone.privatelyWithdraw777KinToCodeUser(t, receivingPhone).requireSuccess(t)
109109
receivingPhone.deposit777KinIntoOrganizer(t).requireSuccess(t)
110110

111111
// [Verified Merchant] sendingPhone SPENT $32.1 USD of Kin
112-
// [Verified Merchant] receivingPhone PAID $32.1 USD of Kin
112+
// [Verified Merchant] receivingPhone RECEIVED $32.1 USD of Kin
113113
sendingPhone.privatelyWithdraw321KinToCodeUserRelationshipAccount(t, receivingPhone, merchantDomain).requireSuccess(t)
114114

115115
// [Verified Merchant] sendingPhone SPENT 123 Kin
@@ -119,21 +119,21 @@ func TestPaymentHistory_HappyPath(t *testing.T) {
119119
receivingPhone.conf.simulatePaymentRequest = true
120120
receivingPhone.conf.simulateUnverifiedPaymentRequest = true
121121

122-
// [Unverified Mechant] receivingPhone PAID $77.7 USD of Kin
122+
// [Unverified Mechant] receivingPhone RECEIVED $77.7 USD of Kin
123123
receivingPhone.privatelyWithdraw777KinToCodeUser(t, receivingPhone).requireSuccess(t)
124124

125125
sendingPhone.resetConfig()
126126
receivingPhone.resetConfig()
127127

128128
// [Cash Transactions] sendingPhone WITHDREW $32.1 USD of Kin
129-
// [Verified Merchant] receivingPhone DEPOSITED $32.1 USD of Kin
129+
// [Verified Merchant] receivingPhone RECEIVED $32.1 USD of Kin
130130
sendingPhone.publiclyWithdraw777KinToCodeUserBetweenRelationshipAccounts(t, merchantDomain, receivingPhone).requireSuccess(t)
131131

132132
// [Cash Transactions] sendingPhone WITHDREW $32.1 USD of Kin
133-
// [Verified Merchant] receivingPhone DEPOSITED $32.1 USD of Kin
133+
// [Verified Merchant] receivingPhone RECEIVED $32.1 USD of Kin
134134
sendingPhone.privatelyWithdraw321KinToCodeUserRelationshipAccount(t, receivingPhone, merchantDomain).requireSuccess(t)
135135

136-
// [Verified Merchant] receivingPhone DEPOSITED 12,345 Kin
136+
// [Verified Merchant] receivingPhone RECEIVED 12,345 Kin
137137
server.simulateExternalDepositHistoryItem(t, receivingPhone.parentAccount, getTimelockVault(t, receivingPhone.getAuthorityForRelationshipAccount(t, merchantDomain)), kin.ToQuarks(12_345))
138138

139139
//
@@ -339,7 +339,7 @@ func TestPaymentHistory_HappyPath(t *testing.T) {
339339
protoChatMessage = getProtoChatMessage(t, chatMessageRecords[0])
340340
require.Len(t, protoChatMessage.Content, 1)
341341
require.NotNil(t, protoChatMessage.Content[0].GetExchangeData())
342-
assert.Equal(t, chatpb.ExchangeDataContent_PAID, protoChatMessage.Content[0].GetExchangeData().Verb)
342+
assert.Equal(t, chatpb.ExchangeDataContent_RECEIVED, protoChatMessage.Content[0].GetExchangeData().Verb)
343343
assert.EqualValues(t, currency_lib.USD, protoChatMessage.Content[0].GetExchangeData().GetExact().Currency)
344344
assert.Equal(t, 0.1, protoChatMessage.Content[0].GetExchangeData().GetExact().ExchangeRate)
345345
assert.Equal(t, 77.7, protoChatMessage.Content[0].GetExchangeData().GetExact().NativeAmount)
@@ -348,7 +348,7 @@ func TestPaymentHistory_HappyPath(t *testing.T) {
348348
protoChatMessage = getProtoChatMessage(t, chatMessageRecords[1])
349349
require.Len(t, protoChatMessage.Content, 1)
350350
require.NotNil(t, protoChatMessage.Content[0].GetExchangeData())
351-
assert.Equal(t, chatpb.ExchangeDataContent_PAID, protoChatMessage.Content[0].GetExchangeData().Verb)
351+
assert.Equal(t, chatpb.ExchangeDataContent_RECEIVED, protoChatMessage.Content[0].GetExchangeData().Verb)
352352
assert.EqualValues(t, currency_lib.USD, protoChatMessage.Content[0].GetExchangeData().GetExact().Currency)
353353
assert.Equal(t, 0.1, protoChatMessage.Content[0].GetExchangeData().GetExact().ExchangeRate)
354354
assert.Equal(t, 32.1, protoChatMessage.Content[0].GetExchangeData().GetExact().NativeAmount)
@@ -357,7 +357,7 @@ func TestPaymentHistory_HappyPath(t *testing.T) {
357357
protoChatMessage = getProtoChatMessage(t, chatMessageRecords[2])
358358
require.Len(t, protoChatMessage.Content, 1)
359359
require.NotNil(t, protoChatMessage.Content[0].GetExchangeData())
360-
assert.Equal(t, chatpb.ExchangeDataContent_DEPOSITED, protoChatMessage.Content[0].GetExchangeData().Verb)
360+
assert.Equal(t, chatpb.ExchangeDataContent_RECEIVED, protoChatMessage.Content[0].GetExchangeData().Verb)
361361
assert.EqualValues(t, currency_lib.USD, protoChatMessage.Content[0].GetExchangeData().GetExact().Currency)
362362
assert.Equal(t, 0.1, protoChatMessage.Content[0].GetExchangeData().GetExact().ExchangeRate)
363363
assert.Equal(t, 77.7, protoChatMessage.Content[0].GetExchangeData().GetExact().NativeAmount)
@@ -366,7 +366,7 @@ func TestPaymentHistory_HappyPath(t *testing.T) {
366366
protoChatMessage = getProtoChatMessage(t, chatMessageRecords[3])
367367
require.Len(t, protoChatMessage.Content, 1)
368368
require.NotNil(t, protoChatMessage.Content[0].GetExchangeData())
369-
assert.Equal(t, chatpb.ExchangeDataContent_DEPOSITED, protoChatMessage.Content[0].GetExchangeData().Verb)
369+
assert.Equal(t, chatpb.ExchangeDataContent_RECEIVED, protoChatMessage.Content[0].GetExchangeData().Verb)
370370
assert.EqualValues(t, currency_lib.USD, protoChatMessage.Content[0].GetExchangeData().GetExact().Currency)
371371
assert.Equal(t, 0.1, protoChatMessage.Content[0].GetExchangeData().GetExact().ExchangeRate)
372372
assert.Equal(t, 32.1, protoChatMessage.Content[0].GetExchangeData().GetExact().NativeAmount)
@@ -375,7 +375,7 @@ func TestPaymentHistory_HappyPath(t *testing.T) {
375375
protoChatMessage = getProtoChatMessage(t, chatMessageRecords[4])
376376
require.Len(t, protoChatMessage.Content, 1)
377377
require.NotNil(t, protoChatMessage.Content[0].GetExchangeData())
378-
assert.Equal(t, chatpb.ExchangeDataContent_DEPOSITED, protoChatMessage.Content[0].GetExchangeData().Verb)
378+
assert.Equal(t, chatpb.ExchangeDataContent_RECEIVED, protoChatMessage.Content[0].GetExchangeData().Verb)
379379
assert.EqualValues(t, currency_lib.KIN, protoChatMessage.Content[0].GetExchangeData().GetExact().Currency)
380380
assert.Equal(t, 1.0, protoChatMessage.Content[0].GetExchangeData().GetExact().ExchangeRate)
381381
assert.Equal(t, 12_345.0, protoChatMessage.Content[0].GetExchangeData().GetExact().NativeAmount)
@@ -388,7 +388,7 @@ func TestPaymentHistory_HappyPath(t *testing.T) {
388388
protoChatMessage = getProtoChatMessage(t, chatMessageRecords[0])
389389
require.Len(t, protoChatMessage.Content, 1)
390390
require.NotNil(t, protoChatMessage.Content[0].GetExchangeData())
391-
assert.Equal(t, chatpb.ExchangeDataContent_PAID, protoChatMessage.Content[0].GetExchangeData().Verb)
391+
assert.Equal(t, chatpb.ExchangeDataContent_RECEIVED, protoChatMessage.Content[0].GetExchangeData().Verb)
392392
assert.EqualValues(t, currency_lib.USD, protoChatMessage.Content[0].GetExchangeData().GetExact().Currency)
393393
assert.Equal(t, 0.1, protoChatMessage.Content[0].GetExchangeData().GetExact().ExchangeRate)
394394
assert.Equal(t, 77.7, protoChatMessage.Content[0].GetExchangeData().GetExact().NativeAmount)

0 commit comments

Comments
 (0)