Skip to content

Commit

Permalink
fix: missing renames (#1883)
Browse files Browse the repository at this point in the history
* fix: renamed code

* fix: ran cargo fmt

* fix: lint issues

* fix: footer links

* fix: formatting

* fix: twitter becomes X

Co-authored-by: Thoralf-M <[email protected]>

* Merge branch 'develop' of github.com:iotaledger/iota into core-node/fix/missing-renames

* fix: review comments

* feat: add pnpm-store to gitignore

* fix: remove links from copyright

* fix: more docs links

* fix: prettier

* fix(docs): fix broken links

---------

Co-authored-by: Thoralf-M <[email protected]>
Co-authored-by: Begoña Alvarez <[email protected]>
Co-authored-by: Dr-Electron <[email protected]>
Co-authored-by: Thibault Martinez <[email protected]>
  • Loading branch information
5 people authored Sep 2, 2024
1 parent 3d1d871 commit d9167d8
Show file tree
Hide file tree
Showing 63 changed files with 186 additions and 184 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ node_modules/
.tsbuildinfo
*.tsbuildinfo
.turbo
.pnpm-store

# App build directories
dist/
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Found a bug or security vulnerability? Create a [GitHub issue](https://github.co

For larger documentation issues, you can [create an issue](https://github.com/iotaledger/iota/issues/new/choose) in GitHub. To fix the problem yourself, follow the [documentation contribution](./docs/content/references/contribute/contribution-process.mdx) guidelines.

Want to contribute to the IOTA framework? See [CONTRIBUTING.md](https://github.com/iotaledger/iota/blob/main/crates/iota-framework/CONTRIBUTING.md) for information related to `iota-framework` crate contributions.
Want to contribute to the IOTA framework? See [CONTRIBUTING.md](https://github.com/iotaledger/iota/blob/develop/crates/iota-framework/CONTRIBUTING.md) for information related to `iota-framework` crate contributions.
15 changes: 7 additions & 8 deletions apps/apps-backend/src/features/features.mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const walletDapps = [
{
name: 'Bullshark Quests',
description: 'Earn rewards through engaging with apps on Iota!',
link: 'https://quests.mystenlabs.com/',
link: 'https://quests.iota.org/',
icon: 'https://user-images.githubusercontent.com/122397493/251579441-3c84de97-fc6e-46d2-b561-cd7bbef7dac7.png',
tags: ['Social'],
},
Expand Down Expand Up @@ -306,7 +306,7 @@ export const developmentFeatures = {
defaultValue: {
enabled: true,
bannerUrl: 'https://iotawallet.com',
imageUrl: 'https://fe-assets.mystenlabs.com/wallet-next/iotawallet-mobile.svg',
imageUrl: 'https://fe-assets.iota.org/wallet-next/iotawallet-mobile.svg',
},
rules: [
{
Expand All @@ -318,8 +318,7 @@ export const developmentFeatures = {
force: {
enabled: false,
bannerUrl: 'https://iota.io/basecamp',
imageUrl:
'https://fe-assets.mystenlabs.com/basecamp/wallet_basecamp_banner.png',
imageUrl: 'https://fe-assets.iota.org/basecamp/wallet_basecamp_banner.png',
},
},
],
Expand All @@ -328,8 +327,8 @@ export const developmentFeatures = {
defaultValue: {
enabled: false,
dismissKey: 'winter-quest',
imageUrl: 'https://fe-assets.mystenlabs.com/quests/winter-apps-interstitial.svg',
bannerUrl: 'https://www.mystenlabs.com/blog/winter-quest',
imageUrl: 'https://fe-assets.iota.org/quests/winter-apps-interstitial.svg',
bannerUrl: 'https://www.blog.iota.org/winter-quest',
},
},
'wallet-defi': {
Expand Down Expand Up @@ -431,8 +430,8 @@ export const developmentFeatures = {
defaultValue: {
enabled: false,
dismissKey: 'quests-3-interstitial-live',
imageUrl: 'https://fe-assets.mystenlabs.com/quests_3_updated_large_corrected.svg',
bannerUrl: 'https://tech.mystenlabs.com/quest-3/',
imageUrl: 'https://fe-assets.iota.org/quests_3_updated_large_corrected.svg',
bannerUrl: 'https://tech.iota.org/quest-3/',
},
},
'iotans-enable-coupons': {
Expand Down
2 changes: 1 addition & 1 deletion apps/core/src/hooks/useCookieConsentBanner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ async function loadCookieConsentBanner<T>(
{
title: 'Cookie usage',
description:
'We use cookies to ensure the basic functionalities of the website and to enhance your online experience. For more details relative to cookies and other sensitive data, please read the full <a aria-label="Choose cookies" class="cc-link" href="https://mystenlabs.com/legal?content=privacy" target="_blank">privacy policy</a>.',
'We use cookies to ensure the basic functionalities of the website and to enhance your online experience. For more details relative to cookies and other sensitive data, please read the full <a aria-label="Choose cookies" class="cc-link" href="https://iota.org/cookie-policy" target="_blank">privacy policy</a>.',
},
{
title: 'Strictly necessary cookies',
Expand Down
6 changes: 3 additions & 3 deletions apps/explorer/src/components/footer/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Text } from '@iota/ui';

import { LegalLinks, LegalText } from './Legal';
import { FooterIcon } from './FooterIcon';
import { ReactComponent as MystenLabsRed } from '../../assets/mysten_labs_red.svg';
import { ReactComponent as IotaFoundationRed } from '../../assets/mysten_labs_red.svg';
import { Link } from '~/components/ui';
import { FOOTER_LINKS, SOCIAL_LINKS } from '~/lib/constants';
import Icon from '../Icon';
Expand Down Expand Up @@ -49,7 +49,7 @@ function Footer(): JSX.Element {
<nav className="flex flex-col justify-center gap-4 divide-y divide-solid divide-gray-45 md:gap-7.5">
<div className="flex flex-col-reverse items-center gap-7.5 md:flex-row md:justify-between ">
<div className="hidden self-center text-hero-dark md:flex md:self-start">
<MystenLabsRed />
<IotaFoundationRed />
</div>
<div>
<FooterLinks />
Expand All @@ -61,7 +61,7 @@ function Footer(): JSX.Element {
</div>
</nav>
<div className="mt-4 flex justify-center border-t border-solid border-gray-45 pt-5 text-hero-dark md:hidden md:self-start">
<MystenLabsRed />
<IotaFoundationRed />
</div>
</footer>
);
Expand Down
3 changes: 1 addition & 2 deletions apps/explorer/src/components/footer/Legal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ export function LegalText(): JSX.Element {
<div className="flex justify-center md:justify-start">
<Text color="steel-darker" variant="pSubtitleSmall/medium">
&copy;
{`${new Date().getFullYear()} Mysten Labs. All
rights reserved.`}
{`${new Date().getFullYear()} IOTA Stiftung. The explorer is adapted from the Sui Explorer, ©2024 by Mysten Labs, licensed under Apache License 2.0. All rights reserved.`}
</Text>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion apps/explorer/src/hooks/useVerifiedSourceCode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export function useVerifiedSourceCode({
queryKey: ['verified-source-code', packageId, moduleName, network],
queryFn: async () => {
const response = await fetch(
`https://source.mystenlabs.com/api?network=${network.toLowerCase()}&address=${packageId}&module=${moduleName}`,
`https://source.iota.org/api?network=${network.toLowerCase()}&address=${packageId}&module=${moduleName}`,
);
if (!response.ok) {
throw new Error(`Encountered unexpected response: ${response.status}`);
Expand Down
18 changes: 9 additions & 9 deletions apps/explorer/src/lib/constants/footer.constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,40 @@
import { SocialDiscord24, SocialLinkedin24, SocialTwitter24 } from '@iota/icons';

export const FOOTER_LINKS = [
{ title: 'Blog', href: 'https://mystenlabs.com/blog' },
{ title: 'Blog', href: 'https://blog.iota.org' },
{
title: 'Docs',
href: 'https://docs.mystenlabs.com',
href: 'https://wiki.iota.org',
},
{
title: 'GitHub',
href: 'https://github.com/MystenLabs',
href: 'https://github.com/iotaledger',
},
{ title: 'Press', href: 'https://mystenlabs.com/#community' },
{ title: 'Press', href: 'https://iota.org/connect/contact' },
];

export const SOCIAL_LINKS = [
{
icon: SocialDiscord24,
href: 'https://discord.gg/BK6WFhud',
href: 'https://discord.iota.org',
},
{
icon: SocialTwitter24,
href: 'https://twitter.com/Mysten_Labs',
href: 'https://x.com/iota',
},
{
icon: SocialLinkedin24,
href: 'https://www.linkedin.com/company/mysten-labs/',
href: 'https://www.linkedin.com/company/iotafoundation/',
},
];

export const LEGAL_LINKS = [
{
title: 'Terms & Conditions',
href: 'https://mystenlabs.com/legal#termsofservice',
href: 'https://iota.org/terms-of-use',
},
{
title: 'Privacy Policy',
href: 'https://mystenlabs.com/legal#privacypolicy',
href: 'https://iota.org/privacy-policy',
},
];
18 changes: 9 additions & 9 deletions apps/explorer/src/lib/utils/analytics/ampli/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
* Build: 1.0.0
* Runtime: browser:typescript-ampli-v2
*
* [View Tracking Plan](https://data.amplitude.com/mystenlabs/Iota%20Explorer/events/main/latest)
* [View Tracking Plan](https://data.amplitude.com/iotaledger/Iota%20Explorer/events/main/latest)
*
* [Full Setup Instructions](https://data.amplitude.com/mystenlabs/Iota%20Explorer/implementation/web)
* [Full Setup Instructions](https://data.amplitude.com/iotaledger/Iota%20Explorer/implementation/web)
*/

import * as amplitude from '@amplitude/analytics-browser';
Expand Down Expand Up @@ -299,7 +299,7 @@ export class Ampli {
/**
* activated tooltip
*
* [View in Tracking Plan](https://data.amplitude.com/mystenlabs/Iota%20Explorer/events/main/latest/activated%20tooltip)
* [View in Tracking Plan](https://data.amplitude.com/iotaledger/Iota%20Explorer/events/main/latest/activated%20tooltip)
*
* When users activate or open a tooltip in the application.
*
Expand All @@ -318,7 +318,7 @@ export class Ampli {
/**
* clicked current epoch card
*
* [View in Tracking Plan](https://data.amplitude.com/mystenlabs/Iota%20Explorer/events/main/latest/clicked%20current%20epoch%20card)
* [View in Tracking Plan](https://data.amplitude.com/iotaledger/Iota%20Explorer/events/main/latest/clicked%20current%20epoch%20card)
*
* When users click the current epoch card on the home page.
*
Expand All @@ -337,7 +337,7 @@ export class Ampli {
/**
* clicked search result
*
* [View in Tracking Plan](https://data.amplitude.com/mystenlabs/Iota%20Explorer/events/main/latest/clicked%20search%20result)
* [View in Tracking Plan](https://data.amplitude.com/iotaledger/Iota%20Explorer/events/main/latest/clicked%20search%20result)
*
* When users click a search result within the search bar.
*
Expand All @@ -356,7 +356,7 @@ export class Ampli {
/**
* clicked validator row
*
* [View in Tracking Plan](https://data.amplitude.com/mystenlabs/Iota%20Explorer/events/main/latest/clicked%20validator%20row)
* [View in Tracking Plan](https://data.amplitude.com/iotaledger/Iota%20Explorer/events/main/latest/clicked%20validator%20row)
*
* When users click a validator list item in a table.
*
Expand All @@ -375,7 +375,7 @@ export class Ampli {
/**
* completed search
*
* [View in Tracking Plan](https://data.amplitude.com/mystenlabs/Iota%20Explorer/events/main/latest/completed%20search)
* [View in Tracking Plan](https://data.amplitude.com/iotaledger/Iota%20Explorer/events/main/latest/completed%20search)
*
* When users successfully search for something.
*
Expand All @@ -394,7 +394,7 @@ export class Ampli {
/**
* opened iota explorer
*
* [View in Tracking Plan](https://data.amplitude.com/mystenlabs/Iota%20Explorer/events/main/latest/opened%20iota%20explorer)
* [View in Tracking Plan](https://data.amplitude.com/iotaledger/Iota%20Explorer/events/main/latest/opened%20iota%20explorer)
*
* When users first open Iota Explorer.
*
Expand All @@ -411,7 +411,7 @@ export class Ampli {
/**
* switched network
*
* [View in Tracking Plan](https://data.amplitude.com/mystenlabs/Iota%20Explorer/events/main/latest/switched%20network)
* [View in Tracking Plan](https://data.amplitude.com/iotaledger/Iota%20Explorer/events/main/latest/switched%20network)
*
* When users switch from one network to another.
*
Expand Down
6 changes: 5 additions & 1 deletion apps/explorer/src/lib/utils/sentry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ export function initSentry() {
/^chrome(?:-extension)?:\/\//i,
/<anonymous>/,
],
allowUrls: [/.*\.iota\.io/i, /.*-mysten-labs\.vercel\.app/i, 'explorer-topaz.vercel.app'],
allowUrls: [
/.*\.iota\.io/i,
/.*-iota-foundation\.vercel\.app/i,
'explorer-topaz.vercel.app',
],
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default function UnstakeTransactionCard({ event }: UnstakeTransactionCard
)}

<div className="flex w-full justify-between py-3.5">
<div className="text-steel flex items-baseline gap-1">Your SUI Stake</div>
<div className="text-steel flex items-baseline gap-1">Your IOTA Stake</div>

<div className="text-steel flex items-baseline gap-1">
{formatPrinciple} {symbol}
Expand Down
2 changes: 1 addition & 1 deletion apps/wallet/configs/webpack/webpack.config.common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ const commonConfig: () => Promise<Configuration> = async () => {
Buffer: ['buffer', 'Buffer'],
}),
new SentryWebpackPlugin({
org: 'mysten-labs',
org: 'iota-foundation',
project: 'wallet',
include: OUTPUT_ROOT,
dryRun: !IS_PROD || !sentryAuthToken,
Expand Down
Loading

0 comments on commit d9167d8

Please sign in to comment.