Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: release v1.737.0 #8609

Merged
merged 5 commits into from
Jan 17, 2025
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 .env.base
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ REACT_APP_FEATURE_THOR_FREE_FEES=true
REACT_APP_FEATURE_LIMIT_ORDERS=true
REACT_APP_FEATURE_NEW_TRADE_FLOW=true
REACT_APP_FEATURE_NEW_WALLET_FLOW=false
REACT_APP_FEATURE_FOX_PAGE_FOX_WIF_HAT_SECTION=false

# absolute URL prefix
REACT_APP_ABSOLUTE_URL_PREFIX=https://app.shapeshift.com
Expand Down
1 change: 1 addition & 0 deletions .env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# meaning we don't want to enable the selection for said chain in prod just yet
# Or alternatively, if we know that a given chain is very unstable and we may want to disable it in swapper altogether.
REACT_APP_FEATURE_SWAPPER_SOLANA=true
REACT_APP_FEATURE_FOX_PAGE_FOX_WIF_HAT_SECTION=true

# Swapper feature flags

Expand Down
5 changes: 4 additions & 1 deletion .env.develop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# Swapper chain-specific flags. Use me if you're working on a swapper which brings first time swapper support for a chain,
# meaning we don't want to enable the selection for said chain in prod just yet
# Or alternatively, if we know that a given chain is very unstable and we may want to disable it in swapper altogether.

REACT_APP_FEATURE_SWAPPER_SOLANA=true
REACT_APP_FEATURE_FOX_PAGE_FOX_WIF_HAT_SECTION=true

# Swapper feature flags

# feature flags
REACT_APP_FEATURE_RFOX_LP=true

# mixpanel
REACT_APP_MIXPANEL_TOKEN=1c1369f6ea23a6404bac41b42817cc4b

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

50 changes: 42 additions & 8 deletions scripts/generateAssetData/color-map.json

Large diffs are not rendered by default.

Binary file added src/assets/foxwifhat-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 20 additions & 2 deletions src/assets/translations/en/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@
"activeAccount": "Active Account",
"update": "Update",
"apy": "APY",
"tbd": "TBD"
"tbd": "TBD",
"installed": "Installed"
},
"consentBanner": {
"body": {
Expand Down Expand Up @@ -1871,6 +1872,15 @@
"onboarding": {
"skip": "Skip",
"shapeshiftWallet": "ShapeShift Wallet",
"createNewWallet": "Create a new wallet",
"shapeshiftNative": "ShapeShift Native",
"addNewWallet": "Add new wallet",
"comingFromThorswap": "Coming from THORSwap?",
"importExisting": "Import existing",
"importFromKeystore": "Import from keystore",
"whatIsShapeshiftWallet": "What is ShapeShift Wallet?",
"yourDecentralizedGateway": "Your decentralization gateway. Trade and earn Bitcoin, Ethereum, Solana and more from a single, secure wallet.",
"crossChainFreedom": "Cross chain freedom. Access the best rates across multiple decentralized exchanges, no middleman required",
"selfCustody": {
"title": "Your ShapeShift Wallet is Self-Custody",
"subTitle": "You hold the keys and you're the only one who can access it.",
Expand Down Expand Up @@ -2770,7 +2780,7 @@
"24hrPriceChange": "24h Price Change",
"rfox": {
"whatIs": "What is rFOX Staking?",
"totalFoxBurn": "Total FOX Burn",
"totalSymbolBurn": "Total %{symbol} Burn",
"simulateTitle": "rFOX Simulator",
"simulateSubtle": "Input number of deposit something",
"estimatedRewards": "Estimated Rewards",
Expand All @@ -2785,6 +2795,14 @@
"totalStakingValue": "Total Staking Value",
"nextEpoch": "Next Epoch"
},
"foxWifHat": {
"title": "FOX Wif Hat",
"description": "It's just FOX wif a hat, don't overthink it. Enjoy a limited time on-chain discount program. As your discount decays learn about FOX on the rest of the page and swap into FOX any time to preserve your fee discount. Whichever holding is higher saves you money on the ShapeShift platform.",
"discount": "*The discount decreases linearly over time, expiring on XX/XX/2025. Take advantage of your XX% discount before it decreases further!",
"claim": "Claim",
"claimed": "Claimed",
"discountText": "*%{percent}% off trade fees"
},
"governance": {
"title": "Governance",
"description": {
Expand Down
1 change: 1 addition & 0 deletions src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ const validators = {
REACT_APP_JUPITER_API_URL: url({ default: JUPITER_API_URL }),
REACT_APP_FEATURE_NEW_TRADE_FLOW: bool({ default: false }),
REACT_APP_FEATURE_NEW_WALLET_FLOW: bool({ default: false }),
REACT_APP_FEATURE_FOX_PAGE_FOX_WIF_HAT_SECTION: bool({ default: false }),
}

function reporter<T>({ errors }: envalid.ReporterOptions<T>) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ const hoverSx = { borderColor: 'blue.500' }

// TODO(gomes): use https://www.chakra-ui.com/docs/components/file-upload if/when we migrate to chakra@3
const FileUpload = ({ onFileSelect }: { onFileSelect: (file: File) => void }) => {
const bgColor = useColorModeValue('gray.50', 'gray.800')
const borderColor = useColorModeValue('gray.200', 'gray.600')
const [isDragging, setIsDragging] = useState(false)
const [filename, setFilename] = useState<string | null>(null)
Expand Down Expand Up @@ -98,7 +97,7 @@ const FileUpload = ({ onFileSelect }: { onFileSelect: (file: File) => void }) =>
flexDirection='column'
alignItems='center'
justifyContent='center'
bg={bgColor}
bg='background.surface.raised.base'
cursor='pointer'
transition='all 0.2s'
_hover={hoverSx}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export const NativePassword = ({ history, location }: NativeSetupProps) => {
vault.seal()
await vault.setPassword(values.password)
vault.meta.set('name', values.name)

history.push(NativeWalletRoutes.Success, { vault })
} catch (e) {
console.error(e)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
import { Box, ModalBody, ModalHeader } from '@chakra-ui/react'
import { useQueryClient } from '@tanstack/react-query'
import { reactQueries } from 'react-queries'
import { Text } from 'components/Text'

import { useNativeSuccess } from '../hooks/useNativeSuccess'
import type { NativeSetupProps } from '../types'

export const NativeSuccess = ({ location }: NativeSetupProps) => {
const queryClient = useQueryClient()
const { isSuccessful } = useNativeSuccess({ vault: location.state.vault })

queryClient.invalidateQueries({
queryKey: reactQueries.common.hdwalletNativeVaultsList().queryKey,
})

return (
<>
<ModalHeader>
Expand Down
2 changes: 1 addition & 1 deletion src/context/WalletProvider/NativeWallet/config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { NativeAdapter } from '@shapeshiftoss/hdwallet-native'
import { FoxIcon } from 'components/Icons/FoxIcon' // Ensure the import path is correct
import { FoxIcon } from 'components/Icons/FoxIcon'
import type { SupportedWalletInfo } from 'context/WalletProvider/config'

type NativeConfigType = Omit<SupportedWalletInfo<typeof NativeAdapter>, 'routes'>
Expand Down
12 changes: 1 addition & 11 deletions src/context/WalletProvider/NativeWallet/types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import type { Vault } from '@shapeshiftoss/hdwallet-native-vault'
import type React from 'react'
import type { RouteComponentProps } from 'react-router-dom'
import type { ActionTypes } from 'context/WalletProvider/actions'

export type NativeWalletValues = {
name: string
Expand All @@ -22,12 +20,4 @@ export interface LocationState {
}
}

export interface NativeSetupProps
extends RouteComponentProps<
{},
any, // history
LocationState
> {
vault: Vault
dispatch: React.Dispatch<ActionTypes>
}
export type NativeSetupProps = RouteComponentProps<{}, any, LocationState>
Loading
Loading