Support Buy and Sell notifications in ActivityFeed service (#12)

Author: jeffyanta

activity/localization.go

@@ -54,6 +54,12 @@ func InjectLocalizedText(ctx context.Context, ocpData ocp_data.Provider, userOwn
 			}
 		}
 
+	case *activitypb.Notification_BoughtCrypto:
+		localizedText = "Purchased"
+
+	case *activitypb.Notification_SoldCrypto:
+		localizedText = "Sold"
+
 	default:
 		return errors.New("unsupported notification type")
 	}

activity/server.go

@@ -15,12 +15,11 @@ import (
 
 	"github.com/code-payments/flipcash2-server/auth"
 	"github.com/code-payments/flipcash2-server/model"
+	ocp_query "github.com/code-payments/ocp-server/database/query"
 	ocp_common "github.com/code-payments/ocp-server/ocp/common"
 	ocp_data "github.com/code-payments/ocp-server/ocp/data"
 	ocp_intent "github.com/code-payments/ocp-server/ocp/data/intent"
 	ocp_transaction "github.com/code-payments/ocp-server/ocp/rpc/transaction"
-	ocp_currency "github.com/code-payments/ocp-server/currency"
-	ocp_query "github.com/code-payments/ocp-server/database/query"
 	"github.com/code-payments/ocp-server/pointer"
 )
 
@@ -275,6 +274,8 @@ func (s *Server) toLocalizedNotifications(ctx context.Context, log *zap.Logger,
 					if !isClaimed {
 						notification.State = activitypb.NotificationState_NOTIFICATION_STATE_PENDING
 					}
+				} else if intentMetadata.IsSwapSell {
+					notification.AdditionalMetadata = &activitypb.Notification_SoldCrypto{SoldCrypto: &activitypb.SoldCryptoNotificationMetadata{}}
 				} else if intentMetadata.IsWithdrawal {
 					notification.AdditionalMetadata = &activitypb.Notification_WithdrewCrypto{WithdrewCrypto: &activitypb.WithdrewCryptoNotificationMetadata{}}
 				} else {
@@ -308,16 +309,21 @@ func (s *Server) toLocalizedNotifications(ctx context.Context, log *zap.Logger,
 			intentMetadata := intentRecord.ExternalDepositMetadata
 
 			// Hide small, potentially spam deposits
-			if intentMetadata.UsdMarketValue < 0.01 {
+			if !intentMetadata.IsSwapBuy && intentMetadata.UsdMarketValue < 0.01 {
 				continue
 			}
 
 			notification.PaymentAmount = &commonpb.CryptoPaymentAmount{
-				Currency:     string(ocp_currency.USD),
-				NativeAmount: intentMetadata.UsdMarketValue,
+				Currency:     string(intentMetadata.ExchangeCurrency),
+				NativeAmount: intentMetadata.NativeAmount,
 				Quarks:       intentMetadata.Quantity,
 			}
-			notification.AdditionalMetadata = &activitypb.Notification_DepositedCrypto{DepositedCrypto: &activitypb.DepositedCryptoNotificationMetadata{}}
+
+			if intentMetadata.IsSwapBuy {
+				notification.AdditionalMetadata = &activitypb.Notification_BoughtCrypto{BoughtCrypto: &activitypb.BoughtCryptoNotificationMetadata{}}
+			} else {
+				notification.AdditionalMetadata = &activitypb.Notification_DepositedCrypto{DepositedCrypto: &activitypb.DepositedCryptoNotificationMetadata{}}
+			}
 
 		default:
 			continue

go.mod

@@ -5,9 +5,9 @@ go 1.25.0
 require (
 	firebase.google.com/go/v4 v4.18.0
 	github.com/ReneKroon/ttlcache v1.7.0
-	github.com/code-payments/flipcash2-protobuf-api v0.1.0
-	github.com/code-payments/ocp-protobuf-api v0.7.0
-	github.com/code-payments/ocp-server v0.14.0
+	github.com/code-payments/flipcash2-protobuf-api v0.2.0
+	github.com/code-payments/ocp-protobuf-api v0.10.0
+	github.com/code-payments/ocp-server v0.24.0
 	github.com/devsisters/go-applereceipt v0.0.0-20240805020915-fa22a0160fc2
 	github.com/georgysavva/scany/v2 v2.1.4
 	github.com/google/uuid v1.6.0

go.sum

@@ -40,14 +40,12 @@ github.com/cockroachdb/cockroach-go/v2 v2.2.0 h1:/5znzg5n373N/3ESjHF5SMLxiW4RKB0
 github.com/cockroachdb/cockroach-go/v2 v2.2.0/go.mod h1:u3MiKYGupPPjkn3ozknpMUpxPaNLTFWAya419/zv6eI=
 github.com/code-payments/code-vm-indexer v1.2.0 h1:rSHpBMiT9BKgmKcXg/VIoi/h0t7jNxGx07Qz59m+6Q0=
 github.com/code-payments/code-vm-indexer v1.2.0/go.mod h1:vn91YN2qNqb+gGJeZe2+l+TNxVmEEiRHXXnIn2Y40h8=
-github.com/code-payments/flipcash2-protobuf-api v0.1.0 h1:SJ8beRISJzLiwYdLEDFrMibb2SSCzyTFhFwv7N2+Itw=
-github.com/code-payments/flipcash2-protobuf-api v0.1.0/go.mod h1:s/1pOsb4FTRD+LcvRKGjfmm6ygRS/m1ep34EIW0fuDs=
-github.com/code-payments/ocp-protobuf-api v0.7.0 h1:pHIVYXmDus32LEzaj92qDWKYrPawuzBIJ+Xlzzf9udg=
-github.com/code-payments/ocp-protobuf-api v0.7.0/go.mod h1:tw6BooY5a8l6CtSZnKOruyKII0W04n89pcM4BizrgG8=
-github.com/code-payments/ocp-server v0.13.0 h1:5OGnwrAosQq3ZKs03SJVUN9ghl9h8aRbnPRjhu67W40=
-github.com/code-payments/ocp-server v0.13.0/go.mod h1:UWdvoBiMc8Ltp1QedZFy+XPsLTAxIOCnTqALJfXfKi8=
-github.com/code-payments/ocp-server v0.14.0 h1:If3P9paQy0Md6okTAj3yXtsk7Pme162ZQDx4Z3zQhaA=
-github.com/code-payments/ocp-server v0.14.0/go.mod h1:UWdvoBiMc8Ltp1QedZFy+XPsLTAxIOCnTqALJfXfKi8=
+github.com/code-payments/flipcash2-protobuf-api v0.2.0 h1:5uL9g0D+WyoCP95rg37CJOPA+a8sPOQrKWrfEEIDM+U=
+github.com/code-payments/flipcash2-protobuf-api v0.2.0/go.mod h1:s/1pOsb4FTRD+LcvRKGjfmm6ygRS/m1ep34EIW0fuDs=
+github.com/code-payments/ocp-protobuf-api v0.10.0 h1:l9Yh3eXdhvgBQS/evg1HYMERXlr7ymASHekAhW/RUmA=
+github.com/code-payments/ocp-protobuf-api v0.10.0/go.mod h1:tw6BooY5a8l6CtSZnKOruyKII0W04n89pcM4BizrgG8=
+github.com/code-payments/ocp-server v0.24.0 h1:QF7K3Nbrapl2tXx4EgL3xPWpxqCM+gCNiP2+RralSBM=
+github.com/code-payments/ocp-server v0.24.0/go.mod h1:+E1VncCtaZGgvM9wKu+qe/AA+gpcbbpu0BXw76vcD4k=
 github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=
 github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=