Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/transaction-pay-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Rename Relay gasless execution feature flag from `gaslessEnabled` to `isGaslessEnabled` ([#8801](https://github.com/MetaMask/core/pull/8801))
- Move the Relay gasless execution feature flag to `confirmations_pay_extended.payStrategies.relay.gaslessEnabled` ([#8810](https://github.com/MetaMask/core/pull/8810))

## [22.4.0]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -464,14 +464,14 @@ describe('Feature Flags Utils', () => {
expect(isRelayExecuteEnabled(messenger)).toBe(false);
});

it('returns true when isGaslessEnabled is true', () => {
it('returns true when gaslessEnabled is true', () => {
getRemoteFeatureFlagControllerStateMock.mockReturnValue({
...getDefaultRemoteFeatureFlagControllerState(),
remoteFeatureFlags: {
confirmations_pay: {
confirmations_pay_extended: {
payStrategies: {
relay: {
isGaslessEnabled: true,
gaslessEnabled: true,
},
},
},
Expand All @@ -481,14 +481,14 @@ describe('Feature Flags Utils', () => {
expect(isRelayExecuteEnabled(messenger)).toBe(true);
});

it('returns false when isGaslessEnabled is false', () => {
it('returns false when gaslessEnabled is false', () => {
getRemoteFeatureFlagControllerStateMock.mockReturnValue({
...getDefaultRemoteFeatureFlagControllerState(),
remoteFeatureFlags: {
confirmations_pay: {
confirmations_pay_extended: {
payStrategies: {
relay: {
isGaslessEnabled: false,
gaslessEnabled: false,
},
},
},
Expand Down
15 changes: 11 additions & 4 deletions packages/transaction-pay-controller/src/utils/feature-flags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,20 @@ export type PayStrategiesConfigRaw = {
across?: AcrossConfigRaw;
relay?: {
enabled?: boolean;
isGaslessEnabled?: boolean;
originGasOverhead?: string;
pollingInterval?: number;
pollingTimeout?: number;
};
};

type FeatureFlagsExtendedRaw = {
Comment thread
cursor[bot] marked this conversation as resolved.
payStrategies?: {
relay?: {
gaslessEnabled?: boolean;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we only used this property currently?

};
};
};

export type PayStrategiesConfig = {
across: AcrossConfig;
relay: {
Expand Down Expand Up @@ -493,10 +500,10 @@ export function isRelayExecuteEnabled(
): boolean {
const state = messenger.call('RemoteFeatureFlagController:getState');
const featureFlags =
(state.remoteFeatureFlags?.confirmations_pay as
Comment thread
pedronfigueiredo marked this conversation as resolved.
| FeatureFlagsRaw
(state.remoteFeatureFlags?.confirmations_pay_extended as
| FeatureFlagsExtendedRaw
| undefined) ?? {};
return featureFlags.payStrategies?.relay?.isGaslessEnabled ?? false;
return featureFlags.payStrategies?.relay?.gaslessEnabled ?? false;
}

/**
Expand Down
Loading