Skip to content

Commit

Permalink
Merge branch 'main' into feat/enable-stx-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
@httpJunkie
httpJunkie authored Jan 16, 2025
2 parents 02bc56c + 7f8d095 commit bea3655
Show file tree
Hide file tree
Showing 87 changed files with 2,186 additions and 470 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,3 +335,16 @@ jobs:
echo "All jobs passed step skipped. Block PR."
exit 1
fi
log-merge-group-failure:
name: Log merge group failure
# Only run this job if the merge group event fails, skip on forks
if: ${{ github.event_name == 'merge_group' && failure() && !github.event.repository.fork }}
needs:
- check-all-jobs-pass
uses: metamask/github-tools/.github/workflows/log-merge-group-failure.yml@6bbad335a01fce1a9ec1eabd9515542c225d46c0
secrets:
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
GOOGLE_SERVICE_ACCOUNT: ${{ secrets.GOOGLE_SERVICE_ACCOUNT }}
SPREADSHEET_ID: ${{ secrets.GOOGLE_MERGE_QUEUE_SPREADSHEET_ID }}
SHEET_NAME: ${{ secrets.GOOGLE_MERGE_QUEUE_SHEET_NAME }}
3 changes: 3 additions & 0 deletions .js.env.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ export SEGMENT_FLUSH_INTERVAL="1"
# example for flush when 1 event is queued
export SEGMENT_FLUSH_EVENT_LIMIT="1"

# URL of the decoding API used to provide additional data from signature requests
export DECODING_API_URL: 'https://signature-insights.api.cx.metamask.io/v1'

# URL of security alerts API used to validate dApp requests.
export SECURITY_ALERTS_API_URL="https://security-alerts.api.cx.metamask.io"

Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.types.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { InternalAccount } from '@metamask/keyring-api';
import { InternalAccount } from '@metamask/keyring-internal-api';

interface SelectedAsset {
isETH: boolean;
Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/AccountSelectorList/AccountSelectorList.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { selectInternalAccounts } from '../../../selectors/accountsController';
import Cell, {
CellVariant,
} from '../../../component-library/components/Cells/Cell';
import { InternalAccount } from '@metamask/keyring-api';
import { InternalAccount } from '@metamask/keyring-internal-api';
import { useStyles } from '../../../component-library/hooks';
import { TextColor } from '../../../component-library/components/Texts/Text';
import SensitiveText, {
Expand Down
14 changes: 0 additions & 14 deletions app/components/UI/Ramp/Views/BuildQuote/__snapshots__/BuildQuote.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2604,7 +2604,6 @@ exports[`BuildQuote View Crypto Currency Data renders the loading page when cryp
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -2794,7 +2793,6 @@ exports[`BuildQuote View Crypto Currency Data renders the loading page when cryp
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -4194,7 +4192,6 @@ exports[`BuildQuote View Fiat Currency Data renders the loading page when fiats
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -4384,7 +4381,6 @@ exports[`BuildQuote View Fiat Currency Data renders the loading page when fiats
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -5784,7 +5780,6 @@ exports[`BuildQuote View Payment Method Data renders the loading page when payme
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -5974,7 +5969,6 @@ exports[`BuildQuote View Payment Method Data renders the loading page when payme
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -7374,7 +7368,6 @@ exports[`BuildQuote View Regions data renders the loading page when regions are
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -7564,7 +7557,6 @@ exports[`BuildQuote View Regions data renders the loading page when regions are
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -8511,7 +8503,6 @@ exports[`BuildQuote View renders correctly 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -8842,7 +8833,6 @@ exports[`BuildQuote View renders correctly 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -9137,7 +9127,6 @@ exports[`BuildQuote View renders correctly 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -11620,7 +11609,6 @@ exports[`BuildQuote View renders correctly 2`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -11951,7 +11939,6 @@ exports[`BuildQuote View renders correctly 2`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -12094,7 +12081,6 @@ exports[`BuildQuote View renders correctly 2`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down
9 changes: 0 additions & 9 deletions app/components/UI/Ramp/Views/OrderDetails/__snapshots__/OrderDetails.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,6 @@ exports[`OrderDetails renders a cancelled order 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -2083,7 +2082,6 @@ exports[`OrderDetails renders a completed order 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -3595,7 +3593,6 @@ exports[`OrderDetails renders a created order 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -5023,7 +5020,6 @@ exports[`OrderDetails renders a failed order 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -6535,7 +6531,6 @@ exports[`OrderDetails renders a pending order 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -9070,7 +9065,6 @@ exports[`OrderDetails renders non-transacted orders 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -10609,7 +10603,6 @@ exports[`OrderDetails renders the support links if the provider has them 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -12141,7 +12134,6 @@ exports[`OrderDetails renders transacted orders that do not have timeDescription
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -13616,7 +13608,6 @@ exports[`OrderDetails renders transacted orders that have timeDescriptionPending
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down
18 changes: 0 additions & 18 deletions app/components/UI/Ramp/Views/PaymentMethods/__snapshots__/PaymentMethods.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,6 @@ exports[`PaymentMethods View renders correctly 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -781,7 +780,6 @@ exports[`PaymentMethods View renders correctly 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -1084,7 +1082,6 @@ exports[`PaymentMethods View renders correctly 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -1945,7 +1942,6 @@ exports[`PaymentMethods View renders correctly for sell 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -2231,7 +2227,6 @@ exports[`PaymentMethods View renders correctly for sell 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -2534,7 +2529,6 @@ exports[`PaymentMethods View renders correctly for sell 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -3391,7 +3385,6 @@ exports[`PaymentMethods View renders correctly while loading 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -3641,7 +3634,6 @@ exports[`PaymentMethods View renders correctly while loading 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -3893,7 +3885,6 @@ exports[`PaymentMethods View renders correctly while loading 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -6591,7 +6582,6 @@ exports[`PaymentMethods View renders correctly with null data 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -6841,7 +6831,6 @@ exports[`PaymentMethods View renders correctly with null data 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -7093,7 +7082,6 @@ exports[`PaymentMethods View renders correctly with null data 1`] = `
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -7823,7 +7811,6 @@ exports[`PaymentMethods View renders correctly with payment method with disclaim
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -8109,7 +8096,6 @@ exports[`PaymentMethods View renders correctly with payment method with disclaim
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -8412,7 +8398,6 @@ exports[`PaymentMethods View renders correctly with payment method with disclaim
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -9964,7 +9949,6 @@ exports[`PaymentMethods View renders correctly with show back button false 1`] =
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -10250,7 +10234,6 @@ exports[`PaymentMethods View renders correctly with show back button false 1`] =
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down Expand Up @@ -10553,7 +10536,6 @@ exports[`PaymentMethods View renders correctly with show back button false 1`] =
"padding": 0,
},
undefined,
undefined,
]
}
>
Expand Down
Loading

0 comments on commit bea3655

Please sign in to comment.