Skip to content

Commit

Permalink
Merge pull request #428 from Cryptonomic/as-vortex
Browse files Browse the repository at this point in the history
1.2.4 RC1
  • Loading branch information
anonymoussprocket authored Nov 10, 2021
2 parents bf1db72 + a9d3949 commit e612288
Show file tree
Hide file tree
Showing 28 changed files with 319 additions and 7,518 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tezori",
"version": "1.2.3-beta",
"version": "1.2.4-beta",
"description": "An open-source wallet framework for the Tezos blockchain.",
"main": "./src/main.prod.js",
"scripts": {
Expand Down Expand Up @@ -103,7 +103,7 @@
"hardenedRuntime": true,
"entitlements": "./resources/entitlements.mac.plist",
"entitlementsInherit": "./resources/entitlements.mac.plist",
"bundleVersion": "48",
"bundleVersion": "50",
"target": [
"mas",
"dmg"
Expand Down
Binary file added resources/contracts/sexp-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Gallery/Gallery.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const Gallery: FunctionComponent<GalleryProps> = ({ children, cols, break
<GalleryContainer padding={containerPadding}>
{isEmpty ? (
<EmptyStateContainer>
<EmptyState imageSrc={transactionsEmptyState} title={t('components.actionPanel.empty-title')} description={null} />
<EmptyState imageSrc={transactionsEmptyState} title={t('components.actionPanel.empty-gallery')} description={null} />
</EmptyStateContainer>
) : (
<StyledMasonry cols={cols} breakpoints={breakpoints} itempadding={itempadding}>
Expand Down
4 changes: 2 additions & 2 deletions src/config.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "Tezori",
"version": "1.2.3-beta",
"version": "1.2.4-beta",
"blockExplorerHost": "https://arronax.io/tezos",
"logo": "tezosLogo.png",
"logoLink": "https://github.com/Cryptonomic/T2",
"termsService": "https://github.com/Cryptonomic/T2",
"privacyPolicy": "https://github.com/Cryptonomic/T2",
"tagline": "containers.loginHome.tagline",
"LocalVersionIndex": "49",
"LocalVersionIndex": "50",
"helpUrl": "https://github.com/Cryptonomic/T2",
"aboutUrl": "",
"ledgerAppUrl": "https://support.ledger.com/hc/en-us/articles/360016057774-Tezos-XTZ-",
Expand Down
40 changes: 37 additions & 3 deletions src/constants/Token.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import wtzIcon from '../../resources/contracts/wtz-icon.png';
import xplentyIcon from '../../resources/contracts/xplenty-icon.png';
import ctezIcon from '../../resources/contracts/ctez-icon.png';
import rcktIcon from '../../resources/contracts/rckt-icon.png';
import sexpIcon from '../../resources/contracts/sexp-icon.png';

export const knownTokenContracts: (Token | VaultToken | ArtToken)[] = [
{
Expand Down Expand Up @@ -258,7 +259,25 @@ export const knownTokenContracts: (Token | VaultToken | ArtToken)[] = [
},
{
network: 'mainnet',
address: 'KT1MsdyBSAMQwzvDH4jt2mxUKJvBSWZuPoRJ',
address: 'KT1Fxz4V3LaUcVFpvF8pAAx8G3Z4H7p7hhDg',
displayName: 'Hash Three Points',
symbol: 'H3P',
balance: 0,
transactions: [],
activeTab: COLLECTION,
kind: TokenKind.objkt,
scale: 0,
precision: 0,
round: 0,
mapid: 19749,
nftMetadataMap: 19750,
helpLink: 'https://h3p.deconcept.com/',
displayHelpLink: 'h3p.deconcept.com',
hideOnLanding: true,
},
{
network: 'mainnet',
address: 'KT1WGDVRnff4rmGzJUbdCRAJBmYt12BrPzdD',
displayName: 'PixelPotus',
symbol: 'POTUS',
balance: 0,
Expand Down Expand Up @@ -398,6 +417,21 @@ export const knownTokenContracts: (Token | VaultToken | ArtToken)[] = [
mapid: 515,
tokenIndex: 0,
},
{
network: 'mainnet',
address: 'KT1Kyc366SrSJ1camxByr363F9WAiHAaReMv',
displayName: 'SEXP',
symbol: 'SEXP',
balance: 0,
transactions: [],
activeTab: TRANSACTIONS,
kind: TokenKind.tzip12,
icon: sexpIcon,
scale: 18,
precision: 18,
round: 6,
mapid: 22833,
},
{
network: 'mainnet',
address: 'KT1MEouXPpCx9eFJYnxfAWpFA7NxhW3rDgUN',
Expand Down Expand Up @@ -477,8 +511,8 @@ export const knownTokenContracts: (Token | VaultToken | ArtToken)[] = [
activeTab: TRANSACTIONS,
kind: TokenKind.tzip7,
icon: ctezIcon,
scale: 18,
precision: 18,
scale: 6,
precision: 6,
round: 6,
mapid: 20920,
balancePath: '$.int',
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/KolibriToken/thunks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ export function harvestRewards(password: string) {
const operationId = await TezosNodeWriter.sendOperation(tezosUrl, pricedOps, isLedger ? signer : await cloneDecryptedSigner(signer, password)).catch(
(err) => {
const errorObj = { name: err.message, ...err };
console.error(`Plenty harvestRewards failed with ${JSON.stringify(errorObj)}`);
console.error(`Kolibri harvestRewards failed with ${JSON.stringify(errorObj)}`);
dispatch(createMessageAction(errorObj.name, true));
return undefined;
}
Expand Down
4 changes: 4 additions & 0 deletions src/contracts/NFT/components/NFTMoreInfo/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ export const NFTMoreInfo: FunctionComponent<NFTMoreInfoProps> = ({ nftObject })
openArtifactLink(`https://objkt.com/asset/rcs/${nftObject.objectId}`);
} else if (nftObject?.provider === NFT_PROVIDERS.TWITZ) {
openArtifactLink(`https://twitz.vercel.app/twitz/${nftObject.objectId}`);
} else if (nftObject?.provider === NFT_PROVIDERS.SUMO) {
openArtifactLink(`https://objkt.com/asset/chopsumo/${nftObject.objectId}`);
} else if (nftObject?.provider === NFT_PROVIDERS.H3P) {
openArtifactLink(`https://objkt.com/asset/h3p/${nftObject.objectId}`);
}
};

Expand Down
1 change: 1 addition & 0 deletions src/contracts/NFT/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const NFT_PROVIDERS = {
SKELE: 'SKELE',
TWITZ: 'TWITZ',
SUMO: 'SUMO',
H3P: 'H3P',
IPFS: 'IPFS',
} as const;

Expand Down
Loading

0 comments on commit e612288

Please sign in to comment.