Update USDF pushes to refer to wallet Cash Reserves (#7)

Author: jeffyanta

geyser/integration.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/code-payments/flipcash2-server/account"
 	"github.com/code-payments/flipcash2-server/push"
-	ocp_geyser "github.com/code-payments/ocp-server/ocp/worker/geyser"
 	ocp_common "github.com/code-payments/ocp-server/ocp/common"
+	ocp_geyser "github.com/code-payments/ocp-server/ocp/worker/geyser"
 )
 
 type Integration struct {
@@ -35,7 +35,7 @@ func (i *Integration) OnDepositReceived(ctx context.Context, owner, mint *ocp_co
 	}
 
 	if ocp_common.IsCoreMint(mint) {
-		return push.SendUsdcReceivedFromDepositPush(ctx, i.pusher, userID, usdMarketValue)
+		return push.SendUsdfReceivedFromDepositPush(ctx, i.pusher, userID, usdMarketValue)
 	}
 	return push.SendFlipcashCurrencyReceivedFromDepositPush(ctx, i.pusher, userID, currencyName, usdMarketValue)
 }

push/pushes.go

@@ -14,41 +14,41 @@ import (
 )
 
 var (
-	defaultLocale     = language.English
-	usdcAmountPrinter = message.NewPrinter(defaultLocale)
+	defaultLocale = language.English
+	amountPrinter = message.NewPrinter(defaultLocale)
 )
 
-func SendUsdcReceivedFromDepositPush(ctx context.Context, pusher Pusher, user *commonpb.UserId, usdMarketValue float64) error {
-	title := "Cash Now Available"
-	body := usdcAmountPrinter.Sprintf(
-		"$%.2f was added to your Flipcash wallet",
+func SendUsdfReceivedFromDepositPush(ctx context.Context, pusher Pusher, user *commonpb.UserId, usdMarketValue float64) error {
+	title := "Cash Reserves Now Available"
+	body := amountPrinter.Sprintf(
+		"$%.2f of Cash Reserves was added to your Flipcash wallet",
 		usdMarketValue,
 	)
 	return pusher.SendBasicPushes(ctx, title, body, user)
 }
 
 func SendFlipcashCurrencyReceivedFromDepositPush(ctx context.Context, pusher Pusher, user *commonpb.UserId, currencyName string, usdMarketValue float64) error {
 	title := fmt.Sprintf("%s Now Available", currencyName)
-	body := usdcAmountPrinter.Sprintf(
+	body := amountPrinter.Sprintf(
 		"$%.2f of %s was added to your Flipcash wallet",
 		usdMarketValue,
 		currencyName,
 	)
 	return pusher.SendBasicPushes(ctx, title, body, user)
 }
 
-func SendUsdcReceivedFromSwapPush(ctx context.Context, pusher Pusher, user *commonpb.UserId, region ocp_currency.Code, nativeAmount float64) error {
-	title := "Cash Now Available"
-	body := usdcAmountPrinter.Sprintf(
-		"%s was added to your Flipcash wallet",
+func SendUsdfReceivedFromSwapPush(ctx context.Context, pusher Pusher, user *commonpb.UserId, region ocp_currency.Code, nativeAmount float64) error {
+	title := "Cash Reserves Now Available"
+	body := amountPrinter.Sprintf(
+		"%s of Cash Reserves was added to your Flipcash wallet",
 		localization.FormatFiat(defaultLocale, region, nativeAmount),
 	)
 	return pusher.SendBasicPushes(ctx, title, body, user)
 }
 
 func SendFlipcashCurrencyReceivedFromSwapPush(ctx context.Context, pusher Pusher, user *commonpb.UserId, currencyName string, region ocp_currency.Code, nativeAmount float64) error {
 	title := fmt.Sprintf("%s Now Available", currencyName)
-	body := usdcAmountPrinter.Sprintf(
+	body := amountPrinter.Sprintf(
 		"%s of %s was added to your Flipcash wallet",
 		localization.FormatFiat(defaultLocale, region, nativeAmount),
 		currencyName,

swap/integration.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/code-payments/flipcash2-server/account"
 	"github.com/code-payments/flipcash2-server/push"
-	ocp_swap "github.com/code-payments/ocp-server/ocp/worker/swap"
-	ocp_common "github.com/code-payments/ocp-server/ocp/common"
 	ocp_currency "github.com/code-payments/ocp-server/currency"
+	ocp_common "github.com/code-payments/ocp-server/ocp/common"
+	ocp_swap "github.com/code-payments/ocp-server/ocp/worker/swap"
 )
 
 type Integration struct {
@@ -31,7 +31,7 @@ func (i *Integration) OnSwapFinalized(ctx context.Context, owner, mint *ocp_comm
 	}
 
 	if ocp_common.IsCoreMint(mint) {
-		return push.SendUsdcReceivedFromSwapPush(ctx, i.pusher, userID, region, nativeAmount)
+		return push.SendUsdfReceivedFromSwapPush(ctx, i.pusher, userID, region, nativeAmount)
 	}
 	return push.SendFlipcashCurrencyReceivedFromSwapPush(ctx, i.pusher, userID, currencyName, region, nativeAmount)
 }