Skip to content

Commit

Permalink
Pull in v2.2.1 (#12)
Browse files Browse the repository at this point in the history
* add notification transformation for NFT Transfers, fix console error when there are no fees in TransactionFeeMap (deso-protocol#526)

* Fix calculation of ETH exchange rate including fee (deso-protocol#530)

* add supply-stats route to show total supply and rich list (deso-protocol#531)

* Fix preview and home screen icons for DeSo (deso-protocol#532)

* Add support for managing sign-up bonus configurations (deso-protocol#529)

* save current progress on updating admin panel

* add support for modifying the sign up bonus config for a single country, update to use default jumio USD cents instead of DeSo nanos

* refresh country bonuses after updating default jumio USD cents

* add tooltip disclaimer about free DESO amount

* update copy

* simplify loops in GetMessages that handles encryption/decryption (deso-protocol#533)

* simplify loops in GetMessages that handles encryption/decryption

* message -> Message

* Fix admin jumio checkboxes (deso-protocol#534)

* use country sign up bonus config inferred from IP address when computing referral amount to display for sign up bonus (deso-protocol#535)

* use flatMap to flatten array of message before decryption (deso-protocol#536)

* Upload referral csv directly instead of parsing on the frontend (deso-protocol#537)

* top diamonded list fix (deso-protocol#480)

* use altumbase for daily gainers leaderboard (deso-protocol#538)

* use altumbase for daily gainers leaderboard

* fix import styling

* [stable] Release 1.2.9

* add disclaimer on referrals page about amounts varying by locality of ID AND add support for setting default kickback amount (deso-protocol#539)

* add disclaimer on referrals page about amounts varying by locality of ID

* add support for updating the default kickback amount for referrers

* add referral code, jumio starter DESO txn Hash, and referrer DeSo Txn hash to User Admin Data (deso-protocol#540)

* make referral link relative to window origin (deso-protocol#541)

* Ln/count keys with deso (deso-protocol#542)

* save current progress

* update some styling on the supply monitoring page

* update supply stats page to show count of keys holding DESO

* Update src/app/supply-monitoring-stats-page/supply-monitoring-stats/supply-monitoring-stats.component.html

* fix admin panel jumio kickback usd cents (deso-protocol#544)

* add support for NFT transfers, burns, and acceptance of transfers (deso-protocol#545)

* add support for NFT transfers, burns, and acceptance of transfers

* fix styling

* change font color to gray for pending ownership

* add fas class to fix issue with icons not appearing in select serial number component (deso-protocol#547)

* Buy Now NFTs and NFT Splits (deso-protocol#546)

* [stable] Release 2.0.0 (deso-protocol#550)

* [stable] Release 2.0.1

* nft notification enhancements (deso-protocol#551)

* save current progress on notifications

* Update NFT notifications and fix some small bugs

* make global vars private again

* remove console logging

* Ln/update sell nft modal (deso-protocol#554)

* show additional royalties in sell nft modal

* remove service fee which is no longer user

* Messages V3 (deso-protocol#543)

* Messages V3

* V3 support

* Messages V3 final

* Add comments & fix version

* Fix circular dependancies

* Revert "Messages V3 (deso-protocol#543)" (deso-protocol#555)

This reverts commit 9d98ea7.

* if get user metadata throws an error, swallow it and return null (deso-protocol#556)

* [stable] Release 2.0.2

* Ln/dao coins (deso-protocol#548)

* save current progress on DAO coin UI

* add support for transferring DAO coins in the UI, add inputs for other fields for DAO coin transaction

* add burn support, add DAO coin tab to profile, use number abbreviation to keep DAO coin numbers manageable, move utility func for parsing hex balances to global vars

* add some frontend validation in transfer modal

* fix up DAO modals - add balances and validations, hit isHodling endpoint if transfer restriction status is DAO Members only

* fix alignment on DAO coin page

* disable mint and burn if the amount is less than or equal to 0

* add notifications for DAO coin txns

* add sweet alerts before DAO actions, only show profile owner if transfer restriction status is profile owner only and logged in user is not profile owner

* address TGS feedback

* Fix errors when user does not have DAO coin yet

* Messages v3 (deso-protocol#557)

* Messages V3

* V3 support

* Messages V3 final

* Add comments & fix version

* Fix circular dependancies

* Add senderGroupKeyName to TransferNFT

* update Query ETH RPC to remove JWT requirement (deso-protocol#558)

* Add support for Pearl node (deso-protocol#561)

* Posts/Users pages are blank when user not logged in (deso-protocol#560)

* fix: metadata fails when user not logged in

this additional checks makes sure verification / node.deso.org metadata is only requested if loggedInUserPublicKey is ok. Currently it requests metadata from `https://node.deso.org/api/v0/get-user-metadata/undefined` which returns status 404 error and prevents post/user pages from showing the content.

* align with diamondapp

use same approach as DiamondApp

* [stable] Release 2.0.4 (deso-protocol#562)

* display media content in replies (deso-protocol#564)

* allow media when creating comments (deso-protocol#565)

* Add support for twitter images.. (deso-protocol#568)

* Add support for twitter images..

this will show images hosted on twitter (they have link like pbs.twing.com ex: https://pbs.twimg.com/media/FO9LbSjaQAEFE26.jpg)

before 
![image](https://user-images.githubusercontent.com/55331140/160470352-bde7f317-fcc7-4680-9180-f9487a7892bc.png)

after
![image](https://user-images.githubusercontent.com/55331140/160470432-5168c8a3-ad78-44e9-a147-3afc1fd11803.png)

will be helpful for those projects which are building bridge between twitter and deso.

* Update Caddyfile

Co-authored-by: Lazy Nina <81658138+lazynina@users.noreply.github.com>

* added Mousai embedding support to frontend (deso-protocol#563)

* Added support for embedding Mousai streaming link in frontend

* Fixed prettier/prettier issue

* Added tests for Mousai embedding functionality

* improved regex matching for mousai links

* added the mousai's url in Caddyfile

* Removed the test-cases that prevent tests from running properly

Co-authored-by: Lazy Nina <81658138+lazynina@users.noreply.github.com>

* Replaced `jasmin.arrayContaining` call with a more logically sounding alternative (based on the available variables)

Co-authored-by: Lazy Nina <81658138+lazynina@users.noreply.github.com>

* Updated `regex` based on the suggestion provided by @lazynina

Co-authored-by: Lazy Nina <81658138+lazynina@users.noreply.github.com>

* Updated `regex` based on the suggestion provided by @lazynina

Co-authored-by: Lazy Nina <81658138+lazynina@users.noreply.github.com>

* Added proper height to Mousai link

* Update src/lib/services/embed-url-parser-service/embed-url-parser-service.ts

Co-authored-by: Lazy Nina <81658138+lazynina@users.noreply.github.com>

* Update src/lib/services/embed-url-parser-service/embed-url-parser-service.ts

Co-authored-by: Lazy Nina <81658138+lazynina@users.noreply.github.com>

Co-authored-by: Lazy Nina <81658138+lazynina@users.noreply.github.com>

* [stable] Release 2.1.0 (deso-protocol#569)

* update reporting links (deso-protocol#571)

* update reporting links

* add /content to path

* Remove jumio messaging and referrals (deso-protocol#573)

* [stable] Release 2.2.0

* [stable] Release 2.2.1

Bumping release to fix a CI issue

* pull in v2.2.1

Co-authored-by: Lazy Nina <81658138+lazynina@users.noreply.github.com>
Co-authored-by: NikolaiL <nikolai1973@gmail.com>
Co-authored-by: maebeam <maebeam0@gmail.com>
Co-authored-by: diamondhands0 <81935176+diamondhands0@users.noreply.github.com>
Co-authored-by: diamondhands <diamondhands@bitcloutdev.com>
Co-authored-by: Piotr Nojszewski <29924594+AeonSw4n@users.noreply.github.com>
Co-authored-by: Tijno (@tijn on Deso) <69529928+tijno@users.noreply.github.com>
Co-authored-by: ItsAditya.eth <55331140+AdityaChaudhary0005@users.noreply.github.com>
Co-authored-by: Farsad Fakhim <fakhim.farsad@gmail.com>
  • Loading branch information
10 people committed May 18, 2022
1 parent 0ba7fd6 commit e5b2821
Show file tree
Hide file tree
Showing 43 changed files with 1,632 additions and 186 deletions.
2 changes: 2 additions & 0 deletions Caddyfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ header @html Content-Security-Policy "
arweave.net
*.arweave.net
*.pearl.app
*.twimg.com
cloudflare-ipfs.com;
font-src 'self'
https://fonts.googleapis.com
Expand All @@ -87,6 +88,7 @@ header @html Content-Security-Policy "
https://w.soundcloud.com
https://player.twitch.tv
https://clips.twitch.tv
https://mousai.stream
pay.testwyre.com
pay.sendwyre.com
https://iframe.videodelivery.net;
Expand Down
23 changes: 22 additions & 1 deletion package-lock.json

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

10 changes: 4 additions & 6 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { DiamondPostsPageComponent } from "./diamond-posts-page/diamond-posts-pa
import { TrendsPageComponent } from "./trends-page/trends-page.component";
import { NftPostPageComponent } from "./nft-post-page/nft-post-page.component";
import { VerifyEmailComponent } from "./verify-email/verify-email.component";
import { ReferralsComponent } from "./referrals/referrals.component";
import { CreateProfileTutorialPageComponent } from "./tutorial/create-profile-tutorial-page/create-profile-tutorial-page.component";
import { BuyCreatorCoinsTutorialPageComponent } from "./tutorial/buy-creator-coins-tutorial-page/buy-creator-coins-tutorial-page.component";
import { BuyCreatorCoinsConfirmTutorialComponent } from "./tutorial/buy-creator-coins-tutorial-page/buy-creator-coins-confirm-tutorial/buy-creator-coins-confirm-tutorial.component";
Expand All @@ -36,9 +35,8 @@ import { WalletTutorialPageComponent } from "./tutorial/wallet-tutorial-page/wal
import { SellCreatorCoinsTutorialComponent } from "./tutorial/sell-creator-coins-tutorial-page/sell-creator-coins-tutorial/sell-creator-coins-tutorial.component";
import { DiamondTutorialPageComponent } from "./tutorial/diamond-tutorial-page/diamond-tutorial-page.component";
import { CreatePostTutorialPageComponent } from "./tutorial/create-post-tutorial-page/create-post-tutorial-page.component";
import {
SupplyMonitoringStatsPageComponent
} from "./supply-monitoring-stats-page/supply-monitoring-stats-page.component";
import { SupplyMonitoringStatsPageComponent } from "./supply-monitoring-stats-page/supply-monitoring-stats-page.component";
import { DaoCoinsPageComponent } from "./dao-coins/dao-coins-page/dao-coins-page.component";

class RouteNames {
// Not sure if we should have a smarter schema for this, e.g. what happens if we have
Expand Down Expand Up @@ -77,14 +75,14 @@ class RouteNames {
public static LANDING = "/";
public static DIAMONDS = "diamonds";
public static TRENDS = "trends";
public static REFERRALS = "referrals";
public static NFT = "nft";
public static VERIFY_EMAIL = "verify-email";

public static TUTORIAL = "tutorial";
public static CREATE_PROFILE = "create-profile";
public static INVEST = "invest";
public static SUPPLY_STATS = "supply-stats";
public static DAO = "dao";
}

const routes: Routes = [
Expand All @@ -96,7 +94,6 @@ const routes: Routes = [
{ path: RouteNames.BUY_DESO, component: BuyDeSoPageComponent, pathMatch: "full" },
{ path: RouteNames.PICK_A_COIN, component: PickACoinPageComponent, pathMatch: "full" },
{ path: RouteNames.INBOX_PREFIX, component: MessagesPageComponent, pathMatch: "full" },
{ path: RouteNames.REFERRALS, component: ReferralsComponent, pathMatch: "full" },
{ path: RouteNames.SIGN_UP, component: SignUpComponent, pathMatch: "full" },
{ path: RouteNames.WALLET, component: WalletPageComponent, pathMatch: "full" },
{ path: RouteNames.UPDATE_PROFILE, component: UpdateProfilePageComponent, pathMatch: "full" },
Expand All @@ -108,6 +105,7 @@ const routes: Routes = [
{ path: RouteNames.POSTS + "/:postHashHex", component: PostThreadPageComponent, pathMatch: "full" },
{ path: RouteNames.NFT + "/:postHashHex", component: NftPostPageComponent, pathMatch: "full" },
{ path: RouteNames.SEND_DESO, component: TransferDeSoPageComponent, pathMatch: "full" },
{ path: RouteNames.DAO, component: DaoCoinsPageComponent, pathMatch: "full" },
{ path: RouteNames.TOS, component: TosPageComponent, pathMatch: "full" },
{ path: "tos", component: TosPageComponent, pathMatch: "full" },
{ path: RouteNames.ADMIN, component: AdminPageComponent, pathMatch: "full" },
Expand Down
10 changes: 8 additions & 2 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import * as _ from "lodash";
import { environment } from "../environments/environment";
import { ThemeService } from "./theme/theme.service";
import { of, Subscription, zip } from "rxjs";
import { catchError } from "rxjs/operators";

@Component({
selector: "app-root",
Expand Down Expand Up @@ -113,8 +114,13 @@ export class AppComponent implements OnInit {

return zip(
this.backendApi.GetUsersStateless(this.globalVars.localNode, [loggedInUserPublicKey], false),
environment.verificationEndpointHostname
? this.backendApi.GetUserMetadata(environment.verificationEndpointHostname, loggedInUserPublicKey)
environment.verificationEndpointHostname && !_.isNil(loggedInUserPublicKey)
? this.backendApi.GetUserMetadata(environment.verificationEndpointHostname, loggedInUserPublicKey).pipe(
catchError((err) => {
console.error(err);
return of(null);
})
)
: of(null)
).subscribe(
([res, userMetadata]) => {
Expand Down
8 changes: 8 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,10 @@ import { TransferNftModalComponent } from "./transfer-nft-modal/transfer-nft-mod
import { TransferNftAcceptModalComponent } from "./transfer-nft-accept-modal/transfer-nft-accept-modal.component";
import { NftBurnModalComponent } from "./nft-burn-modal/nft-burn-modal.component";
import { NftSelectSerialNumberComponent } from "./nft-select-serial-number/nft-select-serial-number.component";
import { DaoCoinsComponent } from "./dao-coins/dao-coins.component";
import { DaoCoinsPageComponent } from "./dao-coins/dao-coins-page/dao-coins-page.component";
import { TransferDAOCoinModalComponent } from "./dao-coins/transfer-dao-coin-modal/transfer-dao-coin-modal.component";
import { BurnDaoCoinModalComponent } from "./dao-coins/burn-dao-coin-modal/burn-dao-coin-modal.component";

// Modular Themes for DeSo by Carsen Klock @carsenk
import { ThemeModule } from "./theme/theme.module";
Expand Down Expand Up @@ -315,6 +319,10 @@ const greenishTheme: Theme = { key: "greenish", name: "Green Theme" };
TransferNftModalComponent,
NftBurnModalComponent,
NftSelectSerialNumberComponent,
DaoCoinsComponent,
DaoCoinsPageComponent,
TransferDAOCoinModalComponent,
BurnDaoCoinModalComponent,
],
imports: [
BrowserModule,
Expand Down
Loading

0 comments on commit e5b2821

Please sign in to comment.