Skip to content

Commit e9f9508

Browse files
committed
Update feature flag key
Fix totals.
1 parent 55ad017 commit e9f9508

File tree

6 files changed

+30
-6
lines changed

6 files changed

+30
-6
lines changed

packages/transaction-pay-controller/src/strategy/bridge/bridge-quotes.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ describe('Bridge Quotes Utils', () => {
127127
getRemoteFeatureFlagControllerStateMock.mockImplementation(() => ({
128128
cacheTimestamp: 0,
129129
remoteFeatureFlags: {
130-
confirmation_pay: getFeatureFlagsMock(),
130+
confirmations_pay: getFeatureFlagsMock(),
131131
},
132132
}));
133133

packages/transaction-pay-controller/src/strategy/bridge/bridge-quotes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ function getFinalRequests(
440440
*/
441441
function getFeatureFlags(messenger: TransactionPayControllerMessenger) {
442442
const featureFlags = messenger.call('RemoteFeatureFlagController:getState')
443-
.remoteFeatureFlags.confirmation_pay as Record<string, number> | undefined;
443+
.remoteFeatureFlags.confirmations_pay as Record<string, number> | undefined;
444444

445445
return {
446446
attemptsMax: featureFlags?.attemptsMax ?? ATTEMPTS_MAX_DEFAULT,

packages/transaction-pay-controller/src/strategy/relay/relay-quotes.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ describe('Relay Quotes Utils', () => {
174174
getRemoteFeatureFlagControllerStateMock.mockReturnValue({
175175
cacheTimestamp: 0,
176176
remoteFeatureFlags: {
177-
confirmation_pay: {
177+
confirmations_pay: {
178178
relayQuoteUrl,
179179
},
180180
},

packages/transaction-pay-controller/src/strategy/relay/relay-quotes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ function getFeatureFlags(messenger: TransactionPayControllerMessenger) {
294294
'RemoteFeatureFlagController:getState',
295295
);
296296

297-
const featureFlags = featureFlagState.remoteFeatureFlags?.confirmation_pay as
297+
const featureFlags = featureFlagState.remoteFeatureFlags?.confirmations_pay as
298298
| Record<string, string>
299299
| undefined;
300300

packages/transaction-pay-controller/src/utils/totals.test.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,25 @@ describe('Totals Utils', () => {
9494
expect(result.total.usd).toBe('51.08');
9595
});
9696

97+
it('returns total excluding token amount not in quote', () => {
98+
const result = calculateTotals(
99+
[QUOTE_1_MOCK, QUOTE_2_MOCK],
100+
[
101+
TOKEN_1_MOCK,
102+
{
103+
...TOKEN_2_MOCK,
104+
balanceRaw: '10',
105+
amountRaw: '9',
106+
skipIfBalance: true,
107+
},
108+
],
109+
MESSENGER_MOCK,
110+
);
111+
112+
expect(result.total.fiat).toBe('39.97');
113+
expect(result.total.usd).toBe('46.64');
114+
});
115+
97116
it('returns provider fees', () => {
98117
const result = calculateTotals(
99118
[QUOTE_1_MOCK, QUOTE_2_MOCK],

packages/transaction-pay-controller/src/utils/totals.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,13 @@ export function calculateTotals(
5050
(quote) => quote.fees.targetNetwork.usd,
5151
);
5252

53-
const amountFiat = sumProperty(tokens, (token) => token.amountFiat);
54-
const amountUsd = sumProperty(tokens, (token) => token.amountUsd);
53+
const quoteTokens = tokens.filter(
54+
(t) =>
55+
!t.skipIfBalance || new BigNumber(t.balanceRaw).isLessThan(t.amountRaw),
56+
);
57+
58+
const amountFiat = sumProperty(quoteTokens, (token) => token.amountFiat);
59+
const amountUsd = sumProperty(quoteTokens, (token) => token.amountUsd);
5560

5661
const totalFiat = new BigNumber(providerFeeFiat)
5762
.plus(sourceNetworkFeeFiat)

0 commit comments

Comments
 (0)